diff --git a/manifest.json b/manifest.json
index d042a79..34b47e9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,11 @@
         "email": ""
     },
     "requirements": {
+<<<<<<< Updated upstream
         "yunohost": ">= 4.2.4"
+=======
+        "yunohost": ">= 4.2.0"
+>>>>>>> Stashed changes
     },
     "multi_instance": true,
     "services": [