fixing merge conflict

Author: stoopidJSON

package-lock.json

@@ -47,10 +47,10 @@
     "express-rate-limit": "5.1.1",
     "express-request-id": "1.4.1",
     "helmet": "3.22.0",
-    "json2csv": "^5.0.0",
+    "json2csv": "^5.0.1",
     "jsonwebtoken": "8.5.1",
     "lodash": "^4.17.15",
-    "mocha": "7.1.1",
+    "mocha": "7.1.2",
     "morgan": "1.10.0",
     "nodemailer": "^6.4.6",
     "nodemon": "2.0.3",

package.json

@@ -98,7 +98,7 @@ router.put('/', async (req, res) => {
 	let message;
 	try {
 		if (validator.isUUID(req.body.id)) {
-			let { id, name, address, phone, email, checkIn, contacts } = req.body;
+			let { id, name, type, address, phone, email, checkIn, contacts } = req.body;
 
 			/** @todo validate emails */
 			// Validating emails 
@@ -111,6 +111,7 @@ router.put('/', async (req, res) => {
 			});
 
 			entity.name = (name) ? name : entity.name;
+			entity.type = (type) ? type : entity.type;
 			entity.address = (address) ? address : entity.address;
 			entity.phone = (phone) ? phone : entity.phone;
 			entity.email = (email) ? email : entity.email;