diff --git a/src/filmstab.py b/src/filmstab.py
index be57e8c..04c119e 100644
--- a/src/filmstab.py
+++ b/src/filmstab.py
@@ -69,11 +69,7 @@ if len(sys.argv) == 1 :
    sys.exit(1)
    
 
-<<<<<<< HEAD
-class Stablilizer:
-=======
 class FilmScanStablilizer:
->>>>>>> a216d1d788344c515a06be2bffb8066f358cdd4e
     
     fr_count = 0
     fr_cur = 0
@@ -353,11 +349,7 @@ alert("Keyframes are loaded.");
     
 if __name__ == '__main__':
     
-<<<<<<< HEAD
-    stab = Stablilizer()
-=======
     stab = FilmScanStablilizer()
->>>>>>> a216d1d788344c515a06be2bffb8066f358cdd4e
     stab.main()
     stab.writeAeScript()