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