diff --git a/.config/yadm/fedora.dconf b/.config/yadm/fedora.dconf
index 7f69aa7..6fd0d17 100644
--- a/.config/yadm/fedora.dconf
+++ b/.config/yadm/fedora.dconf
@@ -14,11 +14,8 @@ session-switch-to-terminal-down='disabled'
 session-switch-to-terminal-left='disabled'
 session-switch-to-terminal-right='disabled'
 session-switch-to-terminal-up='disabled'
-<<<<<<< HEAD
-=======
 terminal-copy='<Alt>c'
 terminal-paste='<Alt>v'
->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
 
 [com/gexperts/Tilix/profiles]
 list=['2b7c4080-0ddd-46c5-8f23-563fd3ba789d', '8b7f94c7-649c-41d6-adc7-7123a631e58e']