Solve conflicts

src/Haddock/Lex.x

@@ -8,6 +8,7 @@
 --
 
 {
+{-# LANGUAGE BangPatterns #-}   -- Generated by Alex
 {-# OPTIONS -Wwarn -w #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix

src/Haddock/Parse.y

 {
+{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6
 {-# OPTIONS -Wwarn -w #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix