diff --git a/tests/prague/eip2537_bls_12_381_precompiles/spec.py b/tests/prague/eip2537_bls_12_381_precompiles/spec.py
index ad4ca5c878..0c7d067cf8 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/spec.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/spec.py
@@ -248,14 +248,7 @@ def msm_discount(group: BLS12Group, k: int) -> int:
 def msm_gas_func_gen(
     group: BLS12Group, len_per_pair: int, multiplication_cost: int
 ) -> Callable[[int], int]:
-    """
-    <<<<<<< HEAD
-        Generate a function that calculates the gas cost for the G1MSM and G2MSM precompiles.
-    =======
-        Generate function that calculates the gas cost for the G1MSM and G2MSM
-        precompiles.
-    >>>>>>> 4e264c33c6 (chore(ruff): changes to `tests/prague`.)
-    """
+    """Generate a function that calculates the gas cost for the G1MSM and G2MSM precompiles."""
 
     def msm_gas(input_length: int) -> int:
         """Calculate gas cost for the G1MSM and G2MSM precompiles."""