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