diff --git a/profiles/base/.tmux.conf b/profiles/base/.tmux.conf
index 31c09bc..69149a2 100644
--- a/profiles/base/.tmux.conf
+++ b/profiles/base/.tmux.conf
@@ -1,13 +1,10 @@
-<<<<<<< HEAD
 set-window-option -g xterm-keys on
 set -s escape-time 10 # faster command timeout
 set -g history-limit 10000 
 
 set -g status-interval 10
-=======
 set-option -g mouse on
 
 # make scrolling with wheels work
 bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'"
 bind -n WheelDownPane select-pane -t= \; send-keys -M
->>>>>>> 1f76fd836f0ef1b53fc69ba45322da6824c50465