diff --git a/foot/foot.ini b/foot/foot.ini
index 82640db..57c0084 100644
--- a/foot/foot.ini
+++ b/foot/foot.ini
@@ -48,7 +48,6 @@ pad=10x7 center                             # optionally append 'center'
 # alternate-scroll-mode=yes
 
 [colors]
-<<<<<<< HEAD
 alpha=1.0
 foreground=ffffff
 background=111217
@@ -68,27 +67,6 @@ bright4=7878c3   # bright blue
 bright5=bf5494   # bright magenta
 bright6=78aac4   # bright cyan
 bright7=b0b0b0   # bright white
-=======
-# alpha=1.0
-# foreground=dcdccc
-# background=111111
-# regular0=222222  # black
-# regular1=cc9393  # red
-# regular2=7f9f7f  # green
-# regular3=d0bf8f  # yellow
-# regular4=6ca0a3  # blue
-# regular5=dc8cc3  # magenta
-# regular6=93e0e3  # cyan
-# regular7=dcdccc  # white
-# bright0=666666   # bright black
-# bright1=dca3a3   # bright red
-# bright2=bfebbf   # bright green
-# bright3=f0dfaf   # bright yellow
-# bright4=8cd0d3   # bright blue
-# bright5=fcace3   # bright magenta
-# bright6=b3ffff   # bright cyan
-# bright7=ffffff   # bright white
->>>>>>> 4959b89adae53ffde6fcaf0d2fb7bce7e27057cf
 # selection-foreground=<inverse foreground/background>
 # selection-background=<inverse foreground/background>
 # jump-labels=<regular0> <regular3>
@@ -125,7 +103,7 @@ font-reset=Control+0 Control+KP_0
 # pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
 # pipe-selected=[xargs -r firefox] none
 # show-urls-launch=Control+Shift+u
-# show-urls-copy=none
+show-urls-copy=Control+Shift+o
 
 [search-bindings]
 # cancel=Control+g Escape
diff --git a/river/init b/river/init
index 02381b2..4b2ac16 100755
--- a/river/init
+++ b/river/init
@@ -152,7 +152,7 @@ riverctl csd-filter-add "gedit"
 
 # Aesthetics
 # Set wallpaper
-riverctl spawn 'wbg ~/images/wallpapers/facets-la-ghosts_ii.jpg'
+riverctl spawn 'wbg ~/images/wallpapers/16-9/facets-la-ghosts_ii.jpg'
 # Colour scheme
 riverctl border-color-focused "#EA4458"
 riverctl border-color-unfocused "#828282"