diff --git a/manifest.json b/manifest.json
index 436110e..1b047ee 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,11 +4,15 @@
     "description": {
         "en": "Free and decentrelized search engine",
         "fr": "Moteur de recherche libre et décentralisé"
+        {
+            categories:[
+                search-engine]
+        }
     },
     "developer": {
         "name": "Moul",
         "email": "moul@moul.re",
-        "url": 
+        "url": "yunohost.org"
     },
     "multi_instance": "true",
     "arguments": {
@@ -16,16 +20,26 @@
             {
                 "name": "domain",
                 "ask": {
+<<<<<<< HEAD
                     "en": "Choose a domain for YaCy",
                     "fr": "Choisisez un nom de domaine sur lequel installer YaCy"
+=======
+                    "en": "Choose a domain for YaCy"
+                    "fr": "Choisi un nom de domaine pour YaCy"
+>>>>>>> 26d191cc215b468d1303bc3f4f3b54262d1ede09
                 },
                 "example": "domain.org"
             },
             {
                 "name": "path",
                 "ask": {
+<<<<<<< HEAD
                     "en": "Choose a path for YaCy",
                     "fr": "Choisisez une adresse sur laquelle installer YaCy"
+=======
+                    "en": "Choose a path for YaCy"
+                    "fr": "Choisi une adresse pour YaCy"
+>>>>>>> 26d191cc215b468d1303bc3f4f3b54262d1ede09
                 },
                 "example": "/yacy",
                 "default": "/yacy"
diff --git a/scripts/install b/scripts/install
index 79f127d..f09a1ab 100644
--- a/scripts/install
+++ b/scripts/install
@@ -35,6 +35,9 @@ echo 'iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 8090
 # Add YaCy service to the YunoHost monitoring
 sudo yunohost service add yacy --log /var/log/yacy/yacy00.log
 
+#Relancer le service YaCy avec la nouvelle configuration
+sudo yunohost service yacy restart
+
 # Reload Nginx and regenerate SSOwat conf
 sudo service nginx reload
 sudo yunohost app ssowatconf
diff --git a/scripts/remove b/scripts/remove
index e25fb33..9e0f946 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+<<<<<<< HEAD
 # Remove Debian official paquage
 sudo apt-get remove yacy
 
@@ -8,3 +9,14 @@ sudo yunohost service remove yacy --log /var/log/yacy/yacy00.log
 
 sudo service nginx reload
 sudo yunohost app ssowatconf 
+=======
+#Remove official Debian package
+sudo apt-get remove yacy -y -qq
+
+#Remove YaCy service to YunoHost monitoring
+sudo yunohost service remove yacy
+
+#Reload Nginx and regenerate SSOwat conf
+sudo service nginx reload
+sudo yunohost app ssowatconf
+>>>>>>> 26d191cc215b468d1303bc3f4f3b54262d1ede09