diff --git a/unittests/test_converters.py b/unittests/test_converters.py
index e9145b3ffce250b6341dd15efc979f99a0b87119..38eb15fa7ca5912eb0d03b0ee2d6cc6bb00b1579 100644
--- a/unittests/test_converters.py
+++ b/unittests/test_converters.py
@@ -432,11 +432,7 @@ def test_converter_value_match(converter_registry):
         m = dc.match(IntegerElement(name="a", value=4))
 
     # overwrite default with match for float
-<< << << < HEAD
-    dc = FloatElementConverter(
-== == == =
-    dc=DictIntegerElementConverter(
->>>>>> > f-values
+    dc=IntegerElementConverter(
         definition={
             "match_name": "(.*)",
             "match_value": "(.*)",