diff --git a/test_runner.py b/test_runner.py
index d090a968..6a7b6b1a 100755
--- a/test_runner.py
+++ b/test_runner.py
@@ -276,7 +276,6 @@ def build_test_list():
         OverrideDefinitions(
             [
                 [
-<<<<<<< HEAD
                     "--training.enable_float8_linear",
                 ]
             ],