diff -Nru f-spot-0.9.0~25/debian/changelog f-spot-0.9.0~25/debian/changelog
--- f-spot-0.9.0~25/debian/changelog	2020-08-03 17:29:09.000000000 +0000
+++ f-spot-0.9.0~25/debian/changelog	2020-08-31 15:30:47.000000000 +0000
@@ -1,3 +1,9 @@
+f-spot (0.9.0~25-5) focal; urgency=medium
+
+  * Patch to fudge key conflicts
+
+ -- Christopher Hoskin <mans0954@debian.org>  Mon, 31 Aug 2020 16:30:47 +0100
+
 f-spot (0.9.0~25-3) focal; urgency=medium
 
   * Patch to disable Alternate RGB profile
diff -Nru f-spot-0.9.0~25/debian/gbp.conf f-spot-0.9.0~25/debian/gbp.conf
--- f-spot-0.9.0~25/debian/gbp.conf	2020-08-03 17:29:09.000000000 +0000
+++ f-spot-0.9.0~25/debian/gbp.conf	2020-08-31 15:30:47.000000000 +0000
@@ -2,6 +2,6 @@
 debian-branch = ubuntu/focal
 
 [buildpackage]
-upstream-tree = master
+upstream-tree = csh-master
 submodules = True
 
diff -Nru f-spot-0.9.0~25/debian/patches/Fudge-key-conflicts.patch f-spot-0.9.0~25/debian/patches/Fudge-key-conflicts.patch
--- f-spot-0.9.0~25/debian/patches/Fudge-key-conflicts.patch	1970-01-01 00:00:00.000000000 +0000
+++ f-spot-0.9.0~25/debian/patches/Fudge-key-conflicts.patch	2020-08-31 15:30:47.000000000 +0000
@@ -0,0 +1,47 @@
+--- a/src/Clients/FSpot/ui/main_window.ui
++++ b/src/Clients/FSpot/ui/main_window.ui
+@@ -150,7 +150,7 @@
+             <property name="label" translatable="yes">Rotate _Left</property>
+             <signal handler="HandleRotate270Command" name="activate"/>
+           </object>
+-          <accelerator key="bracketleft" modifiers=""/>
++          <accelerator key="bracketleft" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+           <object class="GtkAction" id="rotate_right">
+@@ -158,7 +158,7 @@
+             <property name="label" translatable="yes">Rotate _Right</property>
+             <signal handler="HandleRotate90Command" name="activate"/>
+           </object>
+-          <accelerator key="bracketright" modifiers=""/>
++          <accelerator key="bracketright" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+           <object class="GtkAction" id="sharpen">
+@@ -166,7 +166,7 @@
+             <property name="label" translatable="yes">_Sharpen...</property>
+             <signal handler="HandleSharpen" name="activate"/>
+           </object>
+-          <accelerator key="s"/>
++          <accelerator key="s" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
+         </child>
+         <child>
+           <object class="GtkAction" id="adjust_time">
+@@ -196,7 +196,7 @@
+             <property name="label" translatable="yes">_Remove From Catalog</property>
+             <signal handler="HandleRemoveCommand" name="activate"/>
+           </object>
+-          <accelerator key="Delete"/>
++          <accelerator key="Delete" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
+         </child>
+         <child>
+           <object class="GtkAction" id="set_as_background">
+@@ -351,7 +351,7 @@
+             <property name="label" translatable="yes">_Loupe</property>
+             <signal handler="HandleLoupe" name="activate"/>
+           </object>
+-          <accelerator key="v"/>
++          <accelerator key="v" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
+         </child>
+         <child>
+           <object class="GtkAction" id="tag_icon_size">
diff -Nru f-spot-0.9.0~25/debian/patches/series f-spot-0.9.0~25/debian/patches/series
--- f-spot-0.9.0~25/debian/patches/series	2020-08-03 16:47:29.000000000 +0000
+++ f-spot-0.9.0~25/debian/patches/series	2020-08-31 15:30:47.000000000 +0000
@@ -8,3 +8,4 @@
 0004-Fix-build-error-with-recent_gtk-sharp.patch
 0006-Revert-Use-csc-instead-of-mcs.patch
 0007-Revert-Merge-pull-request-123-from-mono-use_msbuild.patch
+Fudge-key-conflicts.patch