diff --git a/manifest.json b/manifest.json
index 99de862..a19e560 100644
--- a/manifest.json
+++ b/manifest.json
@@ -26,11 +26,7 @@
     "multi_instance": false,
     "services": [
         "nginx",
-<<<<<<< Updated upstream
         "php8.0-fpm",
-=======
-        "php7.4-fpm",
->>>>>>> Stashed changes
         "postgresql",
         "metronome"
     ],