fix conflict

composer.json

@@ -1,7 +1,7 @@
 {
-    "name": "laravel/laravel",
-    "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
+    "name": "cretueusebiu/laravel-vue-spa",
+    "description": "A Laravel-Vue SPA starter project template.",
+    "keywords": ["spa", "laravel", "vue"],
     "license": "MIT",
     "type": "project",
     "require": {
@@ -9,12 +9,16 @@
         "fideloper/proxy": "^4.0",
         "intervention/image": "^2.4",
         "laravel/framework": "5.6.*",
-        "laravel/tinker": "^1.0",
+        "laravel/socialite": "^3.0",
+        "laravel/tinker": "~1.0",
+        "tymon/jwt-auth": "^1.0.0-rc.2",
+        "zizaco/entrust": "dev-master",
         "laravelcollective/html": "^5.6"
     },
     "require-dev": {
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
+        "laravel/dusk": "^3.0",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",
         "phpunit/phpunit": "^7.0"
@@ -36,6 +40,7 @@
     "extra": {
         "laravel": {
             "dont-discover": [
+              "laravel/dusk"
             ]
         }
     },
@@ -43,19 +48,18 @@
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
-        "post-create-project-cmd": [
-            "@php artisan key:generate"
-        ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover"
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate",
+            "@php artisan jwt:secret --force"
         ]
     },
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
         "optimize-autoloader": true
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }