diff --git a/dot_config/i3/config b/dot_config/i3/config
index 28cdffa..fafcf9a 100644
--- a/dot_config/i3/config
+++ b/dot_config/i3/config
@@ -68,11 +68,7 @@ bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
 # bindsym $mod+space exec dmenu_run
-<<<<<<< HEAD
 bindsym $mod+space exec $HOME/.local/scripts/rofiwrap.sh
-=======
-bindsym $mod+space exec "rofi -show combi -modi combi -combi-modi window,drun -levenshtein-sort"
->>>>>>> fd56869... changes
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.