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