diff --git a/Database/MongoDB/Query.hs b/Database/MongoDB/Query.hs
index baf5472..167b7c8 100644
--- a/Database/MongoDB/Query.hs
+++ b/Database/MongoDB/Query.hs
@@ -1367,13 +1367,8 @@ findOne q = do
             qr <- queryRequestOpMsg False q {limit = 1}
             let newQr =
                   case fst qr of
-<<<<<<< HEAD
-                    Req qry ->
-                      let (_db, coll) = splitDot (qFullCollection qry)
-=======
                     Req P.Query{..} ->
                       let coll = last $ T.splitOn "." qFullCollection
->>>>>>> 46643fd8ad74254c8b22a25091c15fc7a9f1d19c
                           -- We have to understand whether findOne is called as
                           -- command directly. This is necessary since findOne is used via
                           -- runCommand as a vehicle to execute any type of commands and notices.