Fix rebasing errors.

src/Text/Pandoc/Writers/FB2.hs

@@ -85,7 +85,7 @@ pandocToFB2 :: PandocMonad m
             -> Pandoc
             -> FBM m String
 pandocToFB2 opts (Pandoc meta blocks) = do
-     modify (\s -> s { writerOptions = opts { writerOptions = opts } })
+     modify (\s -> s { writerOptions = opts })
      desc <- description meta
      fp <- frontpage meta
      secs <- renderSections 1 blocks

src/Text/Pandoc/Writers/HTML.hs

@@ -115,7 +115,7 @@ writeHtml :: PandocMonad m => WriterOptions -> Pandoc -> m Html
 writeHtml opts d = do
   (body, context) <- evalStateT (pandocToHtml opts d) defaultWriterState
   return $ case writerTemplate opts of
-             Nothing  -> renderHtml body
+             Nothing  -> body
              Just tpl -> renderTemplate' tpl $
                            defField "body" (renderHtml body) context