Fixed merge conflicts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oe-migration",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "This module is an app-list module for oe-Cloud based applications. It provides the ability to perform data migration and/or data seeding into the app db from json files",
   "engines": {
     "node": ">=6"
@@ -24,7 +24,7 @@
     "chai-things": "0.2.0",
     "chalk": "1.1.1",
     "eslint": "4.10.0",
-    "grunt": "1.0.3",
+    "grunt": "1.0.4",
     "grunt-banner": "0.6.0",
     "grunt-cli": "1.3.2",
     "grunt-contrib-clean": "2.0.0",
@@ -35,10 +35,10 @@
     "grunt-mocha-test": "0.13.3",
     "istanbul": "0.4.5",
     "mocha": "5.2.0",
-    "oe-cloud": "2.0.0",
+    "oe-cloud": "^2.0.0",
     "loopback-connector-mongodb": "3.9.2",
-    "oe-connector-postgresql": "2.0.0",
-    "oe-multi-tenancy": "2.0.0",
+    "oe-connector-postgresql": "^2.0.0",
+    "oe-multi-tenancy": "^2.0.0",
     "superagent-defaults": "0.1.14",
     "supertest": "3.4.2"
   },

test/component-config.json

@@ -1,5 +1,2 @@
 {
-  "loopback-component-explorer": {
-    "mountPath": "/explorer"
-  }
 }