Fix conflicts

Cabal/src/Distribution/Simple/Haddock.hs

cabal-install/src/Distribution/Client/CmdHaddockProject.hs

...tsuite/PackageTests/Backpack/Includes2/setup-external.out

...e/PackageTests/Backpack/Includes2/setup-per-component.out

...ckageTests/Backpack/Includes3/setup-external-explicit.out

...ckageTests/Backpack/Includes3/setup-external-ok.cabal.out

...ite/PackageTests/Backpack/Includes3/setup-external-ok.out

...testsuite/PackageTests/Backpack/Reexport1/setup.cabal.out

cabal-testsuite/PackageTests/Backpack/Reexport1/setup.out

cabal-testsuite/PackageTests/Haddock/setup.cabal.out

cabal-testsuite/PackageTests/Haddock/setup.out

cabal-testsuite/PackageTests/HaddockArgs/quickjump.out

cabal-testsuite/PackageTests/HaddockNewline/setup.cabal.out

cabal-testsuite/PackageTests/HaddockNewline/setup.out

.../PackageTests/InternalLibraries/Haddock/haddock.cabal.out

...tsuite/PackageTests/InternalLibraries/Haddock/haddock.out

cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out

...suite/PackageTests/NewHaddock/ImplyDependencies/cabal.out