Avoid dodgy Rep (..) import in Cabal-syntax

Fixes #9070.

(cherry picked from commit ec75950)

# Conflicts:
#	Cabal-syntax/src/Distribution/Compat/Prelude.hs

Author: RyanGlScott

Cabal-syntax/src/Distribution/Compat/Prelude.hs

@@ -185,10 +185,17 @@ import Data.Void                     (Void, absurd, vacuous)
 import Data.Word                     (Word, Word16, Word32, Word64, Word8)
 import Distribution.Compat.Binary    (Binary (..))
 import Distribution.Compat.Semigroup (Semigroup (..), gmappend, gmempty)
+<<<<<<< HEAD
 import Distribution.Compat.Typeable  (TypeRep, Typeable, typeRep)
 import GHC.Generics                  ((:*:) ((:*:)), (:+:) (L1, R1), Generic, K1 (unK1), M1 (unM1), Rep (..), U1 (U1), V1)
 import System.Exit                   (ExitCode (..), exitFailure, exitSuccess, exitWith)
 import Text.Read                     (readMaybe)
+=======
+import Distribution.Compat.Typeable (TypeRep, Typeable, typeRep)
+import GHC.Generics (Generic (..), K1 (unK1), M1 (unM1), U1 (U1), V1, (:*:) ((:*:)), (:+:) (L1, R1))
+import System.Exit (ExitCode (..), exitFailure, exitSuccess, exitWith)
+import Text.Read (readMaybe)
+>>>>>>> ec75950b3 (Avoid dodgy Rep (..) import in Cabal-syntax)
 
 import qualified Text.PrettyPrint as Disp