diff --git a/dotfiles/dot_config/kmonad/snap.kbd b/dotfiles/dot_config/kmonad/snap.kbd
index 64248ba..edea5c5 100644
--- a/dotfiles/dot_config/kmonad/snap.kbd
+++ b/dotfiles/dot_config/kmonad/snap.kbd
@@ -12,7 +12,6 @@
  f17 lctl slck lmet lalt           spc            ralt rmet rctrl)
 
 (defalias
-<<<<<<< HEAD:dotfiles/dot_config/kmonad/snap.kbd
   supesc (tap-hold-next-release 200 esc lmet)
   sp-lsft (tap-hold-next-release 200 \( lsft)
   sp-rsft (tap-hold-next-release 200 \) lsft))