diff --git a/express-server/db-connect/db-connect.js b/express-server/db-connect/db-connect.js
index 6d2f9677..94fefa06 100644
--- a/express-server/db-connect/db-connect.js
+++ b/express-server/db-connect/db-connect.js
@@ -657,10 +657,4 @@ module.exports = {
     removeMember,
     moveDoneItemMan,
     getUser,
-<<<<<<< HEAD
-    getUserDB,
-    deleteDonePurchase
-=======
-    realUpdateUser
->>>>>>> 3ab823a0258758dd48a687eaafed77ee36832b61
 }
\ No newline at end of file