incoming change

express-server/package.json

@@ -30,11 +30,7 @@
     "mongoose": "^6.6.1",
     "mongoose-unique-validator": "^2.0.1",
     "nodemailer": "^6.4.6",
-<<<<<<< HEAD
-    "nodemon": "^2.0.2",
-=======
     "nodemon": "^2.0.20",
->>>>>>> test
     "passport": "^0.6.0",
     "passport-facebook": "^3.0.0",
     "passport-google-oauth20": "^2.0.0",