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