diff --git a/cabal-install/src/Distribution/Client/HashValue.hs b/cabal-install/src/Distribution/Client/HashValue.hs
index 2c7d7fd02c1..699459f1811 100644
--- a/cabal-install/src/Distribution/Client/HashValue.hs
+++ b/cabal-install/src/Distribution/Client/HashValue.hs
@@ -1,17 +1,5 @@
 {-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-<<<<<<< HEAD
-{-# LANGUAGE DeriveGeneric      #-}
-module Distribution.Client.HashValue (
-    HashValue,
-    hashValue,
-    truncateHash,
-    showHashValue,
-    showHashValueBase64,
-    readFileHashValue,
-    hashFromTUF,
-    ) where
-=======
 {-# LANGUAGE DeriveGeneric #-}
 
 module Distribution.Client.HashValue
@@ -22,23 +10,15 @@ module Distribution.Client.HashValue
   , readFileHashValue
   , hashFromTUF
   ) where
->>>>>>> 97f99171b (Use Base16 hash for script path.)
 
 import Distribution.Client.Compat.Prelude
 import Prelude ()
 
 import qualified Hackage.Security.Client as Sec
 
-<<<<<<< HEAD
-import qualified Crypto.Hash.SHA256         as SHA256
-import qualified Data.ByteString.Base16     as Base16
-import qualified Data.ByteString.Base64     as Base64
-import qualified Data.ByteString.Char8      as BS
-=======
 import qualified Crypto.Hash.SHA256 as SHA256
 import qualified Data.ByteString.Base16 as Base16
 import qualified Data.ByteString.Char8 as BS
->>>>>>> 97f99171b (Use Base16 hash for script path.)
 import qualified Data.ByteString.Lazy.Char8 as LBS
 
 import System.IO         (IOMode (..), withBinaryFile)
diff --git a/cabal-install/src/Distribution/Client/ScriptUtils.hs b/cabal-install/src/Distribution/Client/ScriptUtils.hs
index c6f89ca1f13..0c7e7cf8514 100644
--- a/cabal-install/src/Distribution/Client/ScriptUtils.hs
+++ b/cabal-install/src/Distribution/Client/ScriptUtils.hs
@@ -20,9 +20,6 @@ import Distribution.Compat.Lens
 import qualified Distribution.Types.Lens as L
 
 import Distribution.CabalSpecVersion
-<<<<<<< HEAD
-    ( CabalSpecVersion (..), cabalSpecLatest)
-=======
   ( CabalSpecVersion (..)
   , cabalSpecLatest
   )
@@ -62,7 +59,6 @@ import Distribution.Client.ProjectConfig.Legacy
 import Distribution.Client.ProjectFlags
   ( flagIgnoreProject
   )
->>>>>>> 97f99171b (Use Base16 hash for script path.)
 import Distribution.Client.ProjectOrchestration
 import Distribution.Client.Config
     ( defaultScriptBuildsDir )