diff --git a/service-mattermost.properties b/service-mattermost.properties
index 7616720..8b69fbd 100644
--- a/service-mattermost.properties
+++ b/service-mattermost.properties
@@ -101,11 +101,8 @@ software.license.url = https://github.com/mattermost/mattermost-server/blob/mast
 software.license.name = GNU Affero General Public License v3.0
 
 # Version du logiciel (type STRING, recommandé).
-<<<<<<< HEAD
-software.version =  9.7.1
-=======
-software.version =  9.9.1
->>>>>>> 16e00a5 (upgrades apps)
+
+software.version =  9.10.0
 
 # Lien web vers les sources du logiciel (type URL, recommandé).
 software.source.url = https://github.com/mattermost/mattermost-server