diff --git a/compose.yml b/compose.yml
index 809ffa5..67ea267 100644
--- a/compose.yml
+++ b/compose.yml
@@ -8,10 +8,7 @@ services:
     ports:
       - 80:80
     environment:
-<<<<<<< HEAD
       - REMOVE_CRAP_PLUGINS=true
-=======
->>>>>>> 1d3671e (Automatically installing and activating WooCommerce in the development environment)
       - WP_PLUGIN_INSTALL=woocommerce
       - WP_PLUGIN_ACTIVATE=--all
   mariadb: