diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index db52c52..7556e6c 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,8 +1,4 @@
 [Settings]
-<<<<<<< HEAD
 gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#555555\nfg_color:#555555;\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#d64937"
-=======
-gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#555555\nfg_color:#555555\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#d64937"
->>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
 gtk-auto-mnemonics = 1
 gtk-visible-focus = automatic