diff --git a/rac_gui.tcl b/rac_gui.tcl
index 0bc5afb..ff24a31 100755
--- a/rac_gui.tcl
+++ b/rac_gui.tcl
@@ -124,7 +124,3 @@ if [file exists [file join $dir(work) 1c_srv_new.cfg]] {
 } else {
     set servers_list ""
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> unstable