diff --git a/cabal.project b/cabal.project
index 3bfe6e08c..8619fb33c 100644
--- a/cabal.project
+++ b/cabal.project
@@ -83,3 +83,7 @@ allow-newer: vault:hashable
 allow-newer: psqueues:hashable
 allow-newer: insert-ordered-containers:hashable
 allow-newer: openapi3:hashable
+
+-- http2-5.3.3 is blacklisted, force http2-5.3.2
+constraints:
+  http2 ==5.3.2 || ==5.3.4
diff --git a/servant-swagger/servant-swagger.cabal b/servant-swagger/servant-swagger.cabal
index fd64ac886..ddc228a66 100644
--- a/servant-swagger/servant-swagger.cabal
+++ b/servant-swagger/servant-swagger.cabal
@@ -71,13 +71,7 @@ library
   hs-source-dirs:      src
   build-depends:       aeson                     >=1.4.2.0 && <3
                      , aeson-pretty              >=0.8.7    && <0.9
-<<<<<<< HEAD
-                     , base                      >=4.14     && <5
-||||||| parent of 026a5a7f (Remove GHC <= 8.10.7 from the support window)
-                     , base                      >=4.9.1.0  && <5
-=======
                      , base                      >= 4.16.4.0 && < 4.21
->>>>>>> 026a5a7f (Remove GHC <= 8.10.7 from the support window)
                      , base-compat               >=0.10.5   && <0.15
                      , bytestring                >=0.10.8.1 && <0.13
                      , http-media                >=0.7.1.3  && <0.9