diff --git a/resurrect.tmux b/resurrect.tmux
index 1c9d9abf..b386ecdd 100755
--- a/resurrect.tmux
+++ b/resurrect.tmux
@@ -9,7 +9,14 @@ set_save_bindings() {
 	local key_bindings=$(get_tmux_option "$save_option" "$default_save_key")
 	local key
 	for key in $key_bindings; do
+<<<<<<< Updated upstream
 		tmux bind-key -N "Save session" "$key" run-shell "$CURRENT_DIR/scripts/save.sh"
+||||||| Stash base
+		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/save.sh"
+=======
+		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/save.sh"
+		tmux bind-key -N "Save session" "$key"
+>>>>>>> Stashed changes
 	done
 }
 
@@ -17,7 +24,14 @@ set_restore_bindings() {
 	local key_bindings=$(get_tmux_option "$restore_option" "$default_restore_key")
 	local key
 	for key in $key_bindings; do
+<<<<<<< Updated upstream
 		tmux bind-key -N "Restore session" "$key" run-shell "$CURRENT_DIR/scripts/restore.sh"
+||||||| Stash base
+		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/restore.sh"
+=======
+		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/restore.sh"
+		tmux bind-key -N "Restore session" "$key"
+>>>>>>> Stashed changes
 	done
 }