diff --git a/unit-test.py b/unit-test.py
index 0b32981..d2a8f74 100644
--- a/unit-test.py
+++ b/unit-test.py
@@ -1,2 +1 @@
-<<<<<<< HEAD
 assert True == True
\ No newline at end of file