.

composer.json

@@ -128,10 +128,13 @@
         {
             "type": "path",
             "url": "./modules/wm-notification"
+<<<<<<< Updated upstream
         },
         {
             "type": "path",
             "url": "./modules/wm-roll-call"
+=======
+>>>>>>> Stashed changes
         }
     ]
 }