diff --git a/wsjt.py b/wsjt.py
index a18e1b7fc..b9769853d 100644
--- a/wsjt.py
+++ b/wsjt.py
@@ -1,4 +1,8 @@
+<<<<<<< .mine
+#------------------------------------------------------------------- WSJT
+=======
 #----------------------------------------------------------------- WSJT
+>>>>>>> .r223
 from Tkinter import *
 from tkFileDialog import *
 import Pmw