fix merge conflict

ChatService/app/models/fcmtoken.js

 var mongoose = require("mongoose");
 
 var fcmTokenSchema = new mongoose.Schema({
-    id : String,
+    id : Number,
 	token: String
 });
 

ChatService/app/routes.js

 module.exports = function(app) {
-    
             // Load Models
             var Driver         = require('./models/driver');
             var FcmToken         = require('./models/fcmtoken');

ChatService/package.json

@@ -11,7 +11,11 @@
   "dependencies": {
     "body-parser": "^1.18.2",
     "express": "^4.16.2",
+    "fs": "0.0.1-security",
+    "http": "0.0.0",
+    "https": "^1.0.0",
     "method-override": "^2.3.10",
-    "mongoose": "^4.13.4"
+    "mongoose": "^4.13.4",
+    "querystring": "^0.2.0"
   }
 }