diff --git a/composer.json b/composer.json
index 642b78a..f332d44 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,13 @@
     "drupal/devel": "^5.1.2",
     "drupal/drupal-extension": "^v5.0.0rc1 || v5.1.0",
     "friends-of-behat/mink-debug-extension": "^2.1",
+<<<<<<< Updated upstream
     "drush/drush": "^12 | ^13",
     "drupal/upgrade_status":"^4.3",
+=======
+    "jangregor/phpstan-prophecy": "^1.0",
+    "drush/drush": "^12",
+>>>>>>> Stashed changes
     "kingdutch/cucumber-linter": "^0.1.0",
     "mglaman/phpstan-drupal": "1.2.4",
     "mikey179/vfsstream": "^1.6.11",