diff --git a/build-constraints.yaml b/build-constraints.yaml
index c0cd7844..b7c320d1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1521,6 +1521,7 @@ packages:
         # https://github.com/fpco/stackage/issues/836
         - singletons < 1.2
 
+<<<<<<< HEAD
         # https://github.com/fpco/stackage/issues/839
         - freenect < 1.2.1
 
@@ -1548,6 +1549,8 @@ packages:
         # https://github.com/fpco/stackage/issues/875
         - ig < 0.6
 
+=======
+>>>>>>> parent of 009af5e... Upper bound for #839
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags: