diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
index b44e754b..277192ef 100644
--- a/servant-server/servant-server.cabal
+++ b/servant-server/servant-server.cabal
@@ -43,9 +43,11 @@ library
     Servant.Server.Internal.ServantErr
     Servant.Utils.StaticFiles
   build-depends:
+<<<<<<< HEAD
         base               >= 4.7  && < 5
       , aeson              >= 0.7  && < 0.11
       , attoparsec         >= 0.12 && < 0.14
+      , base64-bytestring  >= 1.0.0.0
       , bytestring         >= 0.10 && < 0.11
       , containers         >= 0.5  && < 0.6
       , http-types         >= 0.8  && < 0.9