diff --git a/build-constraints.yaml b/build-constraints.yaml
index 74854d56..078e78c1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -739,6 +739,7 @@ packages:
     "Francesco Mazzoli f@mazzo.li @bitonic":
         - language-c-quote
 
+<<<<<<< HEAD
     "Sönke Hahn soenkehahn@gmail.com @soenkehahn":
         - string-conversions
 
@@ -823,6 +824,19 @@ packages:
         - soap-tls
         - soap-openssl
 
+    "Stian Håklev shaklev@gmail.com @houshuang":
+        - ipython-kernel
+        - ihaskell
+        - ihaskell-aeson
+        - ihaskell-basic
+        - ihaskell-blaze
+        - ihaskell-charts
+        - ihaskell-diagrams
+        - ihaskell-juicypixels
+        - ihaskell-magic
+        - ihaskell-parsec
+        - ihaskell-rlangqq
+
     "Stackage upper bounds":
         # GHC 7.8 uppdate bound
         - haddock-api < 2.16