diff --git a/composer.json b/composer.json
index a9c723e..65256dc 100644
--- a/composer.json
+++ b/composer.json
@@ -128,13 +128,10 @@
         {
             "type": "path",
             "url": "./modules/wm-notification"
-<<<<<<< Updated upstream
         },
         {
             "type": "path",
             "url": "./modules/wm-roll-call"
-=======
->>>>>>> Stashed changes
         }
     ]
 }