diff --git a/tests/test_http_api_contract.py b/tests/test_http_api_contract.py
index f9fd9a0..062196f 100644
--- a/tests/test_http_api_contract.py
+++ b/tests/test_http_api_contract.py
@@ -352,7 +352,6 @@ def test_embedded_webui_config_page_is_grouped():
     assert "Relay Outputs" in source
     assert "Temperature Assignment" in source
     assert "Maintenance" in source
-<<<<<<< HEAD
 
 
 def test_embedded_webui_config_subtabs():
@@ -376,5 +375,3 @@ def test_embedded_webui_api_badge_labels_are_clear():
     assert "API Live" in source
     assert "API Error" in source
     assert 'textContent="Offline"' not in source
-=======
->>>>>>> parent of 2f973a2 (webui: organize config page with subtabs)