diff --git a/src/ui/glade/about.glade b/src/ui/glade/about.glade
index bb1370c..9caae72 100644
--- a/src/ui/glade/about.glade
+++ b/src/ui/glade/about.glade
@@ -9,11 +9,7 @@
     <property name="type_hint">dialog</property>
     <property name="gravity">center</property>
     <property name="program_name">Linux Wifi Hotspot</property>
-<<<<<<< HEAD
     <property name="version">4.0.0</property>
-=======
-    <property name="version">3.6.8</property>
->>>>>>> Add about dialog
     <property name="copyright" translatable="yes">(c) lakinduakash 2021</property>
     <property name="comments" translatable="yes">For more info visit
 https://github.com/lakinduakash/linux-wifi-hotspot</property>