diff --git a/servant-docs/src/Servant/Docs/Internal.hs b/servant-docs/src/Servant/Docs/Internal.hs
index 41754c31..17e0b10c 100644
--- a/servant-docs/src/Servant/Docs/Internal.hs
+++ b/servant-docs/src/Servant/Docs/Internal.hs
@@ -718,7 +718,6 @@ instance OVERLAPPING_
 instance OVERLAPPABLE_
         (ToSample a, AllMimeRender (ct ': cts) a)
     => HasDocs (Get (ct ': cts) a) where
->>>>>>> Simplify verb combinators.
   docsFor Proxy (endpoint, action) DocOptions{..} =
     single endpoint' action'
 
diff --git a/servant-server/src/Servant/Server/Internal.hs b/servant-server/src/Servant/Server/Internal.hs
index 4dcacb75..730e96d5 100644
--- a/servant-server/src/Servant/Server/Internal.hs
+++ b/servant-server/src/Servant/Server/Internal.hs
@@ -198,7 +198,6 @@ instance OVERLAPPABLE_
           status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)
 
 instance OVERLAPPING_
-instance
          ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
          , GetHeaders (Headers h a)
          ) => HasServer (Verb method status ctypes (Headers h a)) where