diff --git a/packages/@vue/cli-service/lib/Service.js b/packages/@vue/cli-service/lib/Service.js
index 668a65d631..8a634e1bfc 100644
--- a/packages/@vue/cli-service/lib/Service.js
+++ b/packages/@vue/cli-service/lib/Service.js
@@ -44,9 +44,14 @@ module.exports = class Service {
       return inlinePkg
     } else if (fs.existsSync(path.join(context, 'package.json'))) {
       const pkg = readPkg.sync({ cwd: context })
+<<<<<<< HEAD
+      if (pkg.vueCli && pkg.vueCli.resolvePlugins) {
+        return this.resolvePkg(null, path.resolve(context, pkg.vueCli.resolvePlugins))
+=======
       if (pkg.vuePlugins && pkg.vuePlugins.resolveFrom) {
         this.pkgContext = path.resolve(context, pkg.vuePlugins.resolveFrom)
         return this.resolvePkg(null, this.pkgContext)
+>>>>>>> 1f5f7c35e53a88a45f404f98dacbac697a65ed16
       }
       return pkg
     } else {