diff --git a/manifest.json b/manifest.json
index b096d4f..ccf281d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
 		"en": "Mastodon is a free, open-source social network.",
 		"fr": "Mastodon est un réseau social gratuit et open source."
 	},
-	"version": "1.4.1",
+	"version": "1.4.7",
 	"url": "https://github.com/tootsuite/mastodon",
 	"license": "AGPL v3.0",
 	"maintainer": {
diff --git a/scripts/backup b/scripts/backup
index f93da22..361ad8d 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -37,4 +37,9 @@ sudo su - postgres <<COMMANDS
 pg_dump --role=mastodon -U postgres --no-password mastodon_production > mastodon_db.sql
 COMMANDS
 ynh_backup "/var/lib/postgresql/${app}_db.sql" "${app}_db.sql"
+<<<<<<< HEAD
 #rm /var/lib/postgresql/mastodon_db.sql
+=======
+# Fix backup fail on yunohost 2.6
+#ynh_secure_remove /var/lib/postgresql/mastodon_db.sql
+>>>>>>> refs/remotes/YunoHost-Apps/master