diff --git a/cabal-install/src/Distribution/Client/Setup.hs b/cabal-install/src/Distribution/Client/Setup.hs
index af597684eb377a0d2387f81a3f2dd4a4f0c72733..ce4d705f76f970f842ff0a9885beea0919529d91 100644
--- a/cabal-install/src/Distribution/Client/Setup.hs
+++ b/cabal-install/src/Distribution/Client/Setup.hs
@@ -72,15 +72,7 @@ import Distribution.Client.IndexUtils.IndexState
 import qualified Distribution.Client.Init.Types as IT
 import qualified Distribution.Client.Init.Defaults as IT
 import Distribution.Client.Targets
-<<<<<<< HEAD
          ( UserConstraint, readUserConstraint )
-=======
-  ( UserConstraint
-  , readUserConstraint
-  )
-import Distribution.Deprecated.ParseUtils (parseSpaceList, parseTokenQ)
-import Distribution.Deprecated.ReadP (readP_to_E)
->>>>>>> 95f48ad71 (Fix parsing of password-command option (#6268))
 import Distribution.Utils.NubList
          ( NubList, toNubList, fromNubList)
 
@@ -2012,53 +2004,6 @@ defaultUploadFlags = UploadFlags {
   }
 
 uploadCommand :: CommandUI UploadFlags
-<<<<<<< HEAD
-uploadCommand = CommandUI {
-    commandName         = "upload",
-    commandSynopsis     = "Uploads source packages or documentation to Hackage.",
-    commandDescription  = Nothing,
-    commandNotes        = Just $ \_ ->
-         "You can store your Hackage login in the ~/.config/cabal/config file\n"
-      ++ relevantConfigValuesText ["username", "password", "password-command"],
-    commandUsage        = \pname ->
-         "Usage: " ++ pname ++ " upload [FLAGS] TARFILES\n",
-    commandDefaultFlags = defaultUploadFlags,
-    commandOptions      = \_ ->
-      [optionVerbosity uploadVerbosity
-       (\v flags -> flags { uploadVerbosity = v })
-
-      ,option [] ["publish"]
-        "Publish the package instead of uploading it as a candidate."
-        uploadCandidate (\v flags -> flags { uploadCandidate = v })
-        (noArg (Flag IsPublished))
-
-      ,option ['d'] ["documentation"]
-        ("Upload documentation instead of a source package. "
-        ++ "By default, this uploads documentation for a package candidate. "
-        ++ "To upload documentation for "
-        ++ "a published package, combine with --publish.")
-        uploadDoc (\v flags -> flags { uploadDoc = v })
-        trueArg
-
-      ,option ['u'] ["username"]
-        "Hackage username."
-        uploadUsername (\v flags -> flags { uploadUsername = v })
-        (reqArg' "USERNAME" (toFlag . Username)
-                            (flagToList . fmap unUsername))
-
-      ,option ['p'] ["password"]
-        "Hackage password."
-        uploadPassword (\v flags -> flags { uploadPassword = v })
-        (reqArg' "PASSWORD" (toFlag . Password)
-                            (flagToList . fmap unPassword))
-
-      ,option ['P'] ["password-command"]
-        "Command to get Hackage password."
-        uploadPasswordCmd (\v flags -> flags { uploadPasswordCmd = v })
-        (reqArg' "PASSWORD" (Flag . words) (fromMaybe [] . flagToMaybe))
-      ]
-  }
-=======
 uploadCommand =
   CommandUI
     { commandName = "upload"
@@ -2130,7 +2075,6 @@ uploadCommand =
             )
         ]
     }
->>>>>>> 95f48ad71 (Fix parsing of password-command option (#6268))
 
 instance Monoid UploadFlags where
   mempty = gmempty
diff --git a/cabal-install/src/Distribution/Deprecated/ParseUtils.hs b/cabal-install/src/Distribution/Deprecated/ParseUtils.hs
index 26bffbd8caa704be7945bb1595d59205289d960f..a92b9ed357bca58e1f4bf5e755118dc96fd47824 100644
--- a/cabal-install/src/Distribution/Deprecated/ParseUtils.hs
+++ b/cabal-install/src/Distribution/Deprecated/ParseUtils.hs
@@ -16,7 +16,6 @@
 -- couple others. It has the parsing framework code and also little parsers for
 -- many of the formats we get in various @.cabal@ file fields, like module
 -- names, comma separated lists etc.
-<<<<<<< HEAD
 
 -- This module is meant to be local-only to Distribution...
 
@@ -28,7 +27,7 @@ module Distribution.Deprecated.ParseUtils (
         Field(..), lineNo,
         FieldDescr(..), readFields,
         parseHaskellString, parseTokenQ,
-        parseOptCommaList,
+        parseSpaceList, parseOptCommaList,
         showFilePath, showToken, showFreeText,
         field, simpleField, listField, listFieldWithSep, spaceListField,
         newLineListField,
@@ -41,45 +40,6 @@ module Distribution.Deprecated.ParseUtils (
         commaNewLineListFieldParsec,
 
         UnrecFieldParser,
-=======
-module Distribution.Deprecated.ParseUtils
-  ( LineNo
-  , PError (..)
-  , PWarning (..)
-  , locatedErrorMsg
-  , syntaxError
-  , warning
-  , runP
-  , runE
-  , ParseResult (..)
-  , parseFail
-  , showPWarning
-  , Field (..)
-  , lineNo
-  , FieldDescr (..)
-  , readFields
-  , parseHaskellString
-  , parseTokenQ
-  , parseSpaceList
-  , parseOptCommaList
-  , showFilePath
-  , showToken
-  , showFreeText
-  , field
-  , simpleField
-  , listField
-  , listFieldWithSep
-  , spaceListField
-  , newLineListField
-  , liftField
-  , readPToMaybe
-  , fieldParsec
-  , simpleFieldParsec
-  , listFieldParsec
-  , commaListFieldParsec
-  , commaNewLineListFieldParsec
-  , UnrecFieldParser
->>>>>>> 95f48ad71 (Fix parsing of password-command option (#6268))
   ) where
 
 import Distribution.Client.Compat.Prelude hiding (get)