From edd525b22a83d0c30191d2c93dd4fee329da8f24 Mon Sep 17 00:00:00 2001
From: Joannis Orlandos <joannis@orlandos.nl>
Date: Mon, 4 May 2020 02:31:41 +0200
Subject: [PATCH] Fix an unresolved  merge conflict

---
 .../CollectionHelpers/Collection+FindAndModify.swift            | 2 +-
 Sources/MongoKitten/CollectionHelpers/Collection+Indexes.swift  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/MongoKitten/CollectionHelpers/Collection+FindAndModify.swift b/Sources/MongoKitten/CollectionHelpers/Collection+FindAndModify.swift
index 7915dc93..7db1ea5c 100644
--- a/Sources/MongoKitten/CollectionHelpers/Collection+FindAndModify.swift
+++ b/Sources/MongoKitten/CollectionHelpers/Collection+FindAndModify.swift
@@ -133,7 +133,7 @@ public final class FindAndModifyBuilder {
                                       sessionId: self.collection.sessionId ?? connection.implicitSessionId)
             
         }
-        .decode(FindAndModifyReply.self)
+        .decodeReply(FindAndModifyReply.self)
         ._mongoHop(to: self.collection.hoppedEventLoop)
     }
     
diff --git a/Sources/MongoKitten/CollectionHelpers/Collection+Indexes.swift b/Sources/MongoKitten/CollectionHelpers/Collection+Indexes.swift
index e5519613..debfc4d7 100644
--- a/Sources/MongoKitten/CollectionHelpers/Collection+Indexes.swift
+++ b/Sources/MongoKitten/CollectionHelpers/Collection+Indexes.swift
@@ -40,7 +40,7 @@ extension MongoCollection {
                 request,
                 namespace: namespace,
                 sessionId: nil
-            ).decode(MongoCursorResponse.self).map { response in
+            ).decodeReply(MongoCursorResponse.self).map { response in
                 return MongoCursor(
                     reply: response.cursor,
                     in: namespace,