diff --git a/cabal.project b/cabal.project
index 4a4f645fc4..18602aa25a 100644
--- a/cabal.project
+++ b/cabal.project
@@ -57,4 +57,25 @@ allow-newer:
   brick:base,
   vector-binary-instances:base,
   cryptohash-sha256:base,
+<<<<<<< HEAD
   hashable
+=======
+  hashable,
+  haskell-src-meta:template-haskell,
+  string-interpolate:template-haskell,
+  string-interpolate:text,
+  tasty-hedgehog:tasty
+
+-- Works around: https://github.com/recursion-schemes/recursion-schemes/issues/128. This
+-- shouldn't harm (runtime) performance of Clash, as we only use recursion-schemes with
+-- TemplateHaskell.
+package recursion-schemes
+    optimization: 0
+
+package regex-tdfa
+    optimization: 2
+
+
+-- rewrite-inspector-0.1.0.11 uses brick-0.50 which doesn't compile with vty-6.0
+constraints: vty < 6.0
+>>>>>>> 6040b0558 (Limit upper bound vty (#2596))