diff --git a/build-constraints.yaml b/build-constraints.yaml
index 078e78c1..e41945f9 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -739,7 +739,6 @@ packages:
     "Francesco Mazzoli f@mazzo.li @bitonic":
         - language-c-quote
 
-<<<<<<< HEAD
     "Sönke Hahn soenkehahn@gmail.com @soenkehahn":
         - string-conversions