diff --git a/servant-docs/src/Servant/Docs.hs b/servant-docs/src/Servant/Docs.hs
index 193b4e60..8e598837 100644
--- a/servant-docs/src/Servant/Docs.hs
+++ b/servant-docs/src/Servant/Docs.hs
@@ -30,11 +30,13 @@ module Servant.Docs
   , DocOptions(..) , defaultDocOptions, maxSamples
 
   , -- * Classes you need to implement for your types
+<<<<<<< HEAD
     ToSample(..)
   , toSample
   , noSamples
   , singleSample
   , samples
+    ToAuthInfo(..)
   , sampleByteString
   , sampleByteStrings
   , ToParam(..)
@@ -44,12 +46,13 @@ module Servant.Docs
     Method(..)
   , Endpoint, path, method, defEndpoint
   , API, apiIntros, apiEndpoints, emptyAPI
+  , AuthenticationInfo(..), authIntro, authDataRequired
   , DocCapture(..), capSymbol, capDesc
   , DocQueryParam(..), ParamKind(..), paramName, paramValues, paramDesc, paramKind
   , DocNote(..), noteTitle, noteBody
   , DocIntro(..), introTitle, introBody
   , Response(..), respStatus, respTypes, respBody, defResponse
-  , Action, captures, headers, notes, params, rqtypes, rqbody, response, defAction
+  , Action, authInfo, captures, headers, notes, params, rqtypes, rqbody, response, defAction
   , single
   ) where