diff --git a/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal-QuickCheck/Cabal-QuickCheck.cabal
index d10d7d8bf96..24c5a718ae4 100644
--- a/Cabal-QuickCheck/Cabal-QuickCheck.cabal
+++ b/Cabal-QuickCheck/Cabal-QuickCheck.cabal
@@ -13,9 +13,15 @@ library
   build-depends:
     , base
     , bytestring
+<<<<<<< HEAD
     , Cabal         ^>=3.12.1.0
     , Cabal-syntax  ^>=3.12.1.0
     , QuickCheck    ^>=2.13.2 || ^>=2.14
+=======
+    , Cabal         ^>=3.17.0.0
+    , Cabal-syntax  ^>=3.17.0.0
+    , QuickCheck    >= 2.13.2 && < 2.18
+>>>>>>> af3395c34 (Bump QuickCheck)
 
   exposed-modules:
     Test.QuickCheck.GenericArbitrary
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index a6ee303ea67..71f6b4d0185 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -332,6 +332,7 @@ test-suite unit-tests
       UnitTests.Options
 
     build-depends:
+<<<<<<< HEAD
           array,
           bytestring,
           cabal-install,
@@ -354,6 +355,30 @@ test-suite unit-tests
           tasty-hunit >= 0.10,
           tree-diff,
           QuickCheck >= 2.14.3 && <2.16
+=======
+      , array
+      , bytestring
+      , cabal-install
+      , Cabal-tree-diff
+      , Cabal-QuickCheck
+      , Cabal-tests
+      , containers
+      , directory
+      , filepath
+      , mtl
+      , network-uri >= 2.6.2.0 && <2.7
+      , random
+      , tar
+      , time
+      , zlib
+      , tasty >= 1.2.3 && <1.6
+      , tasty-golden >=2.3.1.1 && <2.4
+      , tasty-quickcheck ^>=0.11
+      , tasty-expected-failure
+      , tasty-hunit >= 0.10
+      , tree-diff
+      , QuickCheck >= 2.14.3 && <2.18
+>>>>>>> af3395c34 (Bump QuickCheck)
 
 
 -- Tests to run with a limited stack and heap size
@@ -423,6 +448,7 @@ test-suite long-tests
     UnitTests.Options
 
   build-depends:
+<<<<<<< HEAD
         Cabal-QuickCheck,
         Cabal-described,
         Cabal-tests,
@@ -441,3 +467,22 @@ test-suite long-tests
         tasty-quickcheck <0.11,
         QuickCheck >= 2.14 && <2.16,
         pretty-show >= 1.6.15
+=======
+    , Cabal-QuickCheck
+    , Cabal-described
+    , Cabal-tests
+    , cabal-install
+    , containers
+    , directory
+    , filepath
+    , mtl
+    , network-uri >= 2.6.2.0 && <2.7
+    , random
+    , tagged
+    , tasty >= 1.2.3 && <1.6
+    , tasty-expected-failure
+    , tasty-hunit >= 0.10
+    , tasty-quickcheck <0.12
+    , QuickCheck >= 2.14 && <2.18
+    , pretty-show >= 1.6.15
+>>>>>>> af3395c34 (Bump QuickCheck)