diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 75d0643..9cc55e3 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -166,10 +166,6 @@
                     <property name="margin-end">5</property>
                     <property name="margin-top">6</property>
                     <property name="margin-bottom">6</property>
-<<<<<<< HEAD
-                    <property name="stock">gtk-missing-image</property>
-=======
->>>>>>> develop
                     <property name="pixel-size">25</property>
                     <property name="icon_size">1</property>
                   </object>