diff --git a/src/Haddock/Backends/Xhtml/Decl.hs b/src/Haddock/Backends/Xhtml/Decl.hs
index 5f4e4efda7efed2107eb5f945e6266b78026f70d..71bcd581a9d56a507f68e20f8ef9f9373b6c8805 100644
--- a/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/src/Haddock/Backends/Xhtml/Decl.hs
@@ -121,7 +121,7 @@ ppFor _ _ _ _ _ _ _ = error "ppFor"
 -- we skip type patterns for now
 ppTySyn :: Bool -> LinksInfo -> SrcSpan -> DocForDecl DocName -> TyClDecl DocName -> Bool
         -> Qualification -> Html
-ppTySyn summary links loc doc (TySynonym (L _ name) ltyvars _ ltype_ ) unicode qual
+ppTySyn summary links loc doc (TySynonym (L _ name) ltyvars _ ltype _) unicode qual
   = ppTypeOrFunSig summary links loc [name] (unLoc ltype) doc
                    (full, hdr, spaceHtml +++ equals) unicode qual
   where
diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs
index 8c3435b8277901c34212487789355551414f2fd9..480e57283c6c65d6d758108ebe35358d1ff4f2a5 100644
--- a/src/Haddock/Convert.hs
+++ b/src/Haddock/Convert.hs
@@ -166,11 +166,7 @@ synifyTyCon tc
   alg_deriv = Nothing
   syn_type = synifyType WithinType (synTyConType tc)
  in if isSynTyCon tc
-<<<<<<< HEAD
-  then TySynonym name Nothing tyvars typats syn_type placeHolderNames
-=======
-  then TySynonym name tyvars typats syn_type
->>>>>>> master
+  then TySynonym name tyvars typats syn_type placeHolderNames
   else TyData alg_nd alg_ctx name Nothing tyvars typats (fmap synifyKind alg_kindSig) alg_cons alg_deriv