diff --git a/README.md b/README.md
index d1663bf..428a05e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
diff --git a/README_fr.md b/README_fr.md
index 06ff0f1..ce6db9f 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -43,4 +43,4 @@ ou
 sudo yunohost app upgrade bicbucstriim -u https://github.com/YunoHost-Apps/bicbucstriim_ynh/tree/testing --debug
 ```
 
-**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
\ No newline at end of file
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 2ea9f11..f279cf3 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -13,7 +13,7 @@ location __PATH__/ {
   index index.php;
 
   try_files $uri $uri/ @bicbucstriim;
-  
+
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
@@ -32,4 +32,3 @@ location __PATH__/ {
 location @bicbucstriim {
     rewrite /(.*)$ /index.php?/$1 last;
 }
-
diff --git a/manifest.toml b/manifest.toml
index d6d03bb..21ac080 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -1,3 +1,5 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json
+
 packaging_format = 2
 
 id = "bicbucstriim"
@@ -39,10 +41,9 @@ ram.runtime = "50M"
     default = "visitors"
 
 [resources]
-        [resources.sources.main]
-        url = "https://github.com/mikespub-org/rvolz-BicBucStriim/releases/download/v1.6.5/bicbucstriim-1.6.5.zip"
-        sha256 = "8cd516fd25253a0aee2c047706164686f175fd23730462eb424196d0bb102b35"
-        in_subdir = false
+    [resources.sources.main]
+    url = "https://github.com/mikespub-org/rvolz-BicBucStriim/releases/download/v1.6.5/bicbucstriim-1.6.5.zip"
+    sha256 = "8cd516fd25253a0aee2c047706164686f175fd23730462eb424196d0bb102b35"
 
     [resources.system_user]
 
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 944a65e..057469a 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,6 +4,14 @@
 # COMMON VARIABLES
 #=================================================
 
+<<<<<<< HEAD
+=======
+YNH_PHP_VERSION="7.4"
+
+pkg_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-mbstring"
+#php${YNH_PHP_VERSION}-mcrypt
+
+>>>>>>> testing
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/tests.toml b/tests.toml
index 91daf17..953b195 100644
--- a/tests.toml
+++ b/tests.toml
@@ -1,7 +1,9 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
+
 test_format = 1.0
 
 [default]
 
     # ------------
     # Tests to run
-    # ------------
\ No newline at end of file
+    # ------------