diff --git a/build-constraints.yaml b/build-constraints.yaml
index 35fa4d2a..9166301a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1310,7 +1310,6 @@ expected-test-failures:
     # https://github.com/ivanperez-keera/Yampa/issues/10
     - Yampa
 
->>>>>>> Remove expected test failure ekmett/machines#44
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4