diff --git a/etl_billiards/config/env_parser.py b/etl_billiards/config/env_parser.py
index e9da6a2..431e08c 100644
--- a/etl_billiards/config/env_parser.py
+++ b/etl_billiards/config/env_parser.py
@@ -24,12 +24,9 @@ ENV_MAP = {
     "OVERLAP_SECONDS":        ("run.overlap_seconds",),
     "WINDOW_BUSY_MIN":        ("run.window_minutes.default_busy",),
     "WINDOW_IDLE_MIN":        ("run.window_minutes.default_idle",),
-<<<<<<< HEAD
-=======
     "TEST_MODE":              ("testing.mode",),
     "TEST_JSON_ARCHIVE_DIR":  ("testing.json_archive_dir",),
     "TEST_JSON_TEMP_DIR":     ("testing.temp_json_dir",),
->>>>>>> main
 }
 
 def _deep_set(d, dotted_keys, value):