fix conflit

composer.json

@@ -27,7 +27,8 @@
         "wm/product": "dev-master",
         "wm/service": "dev-master",
         "wm/store": "dev-master",
-	"wm/admin": "dev-master",
+	    "wm/admin": "dev-master",
+        "wm/notification": "dev-master",
         "zircote/swagger-php": "^3.0"
     },
     "provide": {
@@ -113,6 +114,10 @@
             "type": "vcs",
             "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/store.git"
         },
+        {
+            "type": "vcs",
+            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/notification.git"
+        },
         {
             "type": "vcs",
             "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/admin.git"

webpack.mix.js

@@ -39,13 +39,14 @@ require('./modules/wm-common/webpack.mix');
 require('./modules/wm-crm/webpack.mix');
 require('./modules/wm-blog/webpack.mix');
 require('./modules/wm-portfolio/webpack.mix');
-//require('./modules/wm-finance/webpack.mix');
 require('./modules/wm-product/webpack.mix');
 require('./modules/wm-service/webpack.mix');
 require('./modules/wm-store/webpack.mix');
-//require('./modules/wm-warehouse/webpack.mix');
 require('./modules/wm-admin/webpack.mix');
+require('./modules/wm-notification/webpack.mix');
+//require('./modules/wm-finance/webpack.mix');
 // require('./modules/wm-web-builder/webpack.mix');
+//require('./modules/wm-warehouse/webpack.mix');
 // require('./modules/wm-reservation/webpack.mix');
 
 mix.version();