diff --git a/service-nextcloud.properties b/service-nextcloud.properties
index a3eb665..dce4af3 100644
--- a/service-nextcloud.properties
+++ b/service-nextcloud.properties
@@ -99,21 +99,14 @@ software.license.url = https://github.com/nextcloud/server/blob/master/COPYING
 software.license.name = GNU Affero General Public License v3.0
 
 # Version du logiciel (type STRING, recommandé).
-<<<<<<< HEAD
-software.version = 28.0.6
-=======
 software.version = 29.0.2
->>>>>>> 16e00a5 (upgrades apps)
 
 # Lien web vers les sources du logiciel (type URL, recommandé).
 software.source.url = https://github.com/nextcloud/server
 
 # Liste de modules optionnels installés (type VALUES, optionnel)
-<<<<<<< HEAD
-# Exemples : Nextcloud-BigBlueButton, Nextcloud-Bookmark, Nextcloud-Calendar, Nextcloud-Carnet, Nextcloud-CollaboraOnline, Nextcloud-Onlyoffice, Nextcloud-Contacts, Nextcloud-Deck, Nextcloud-Forms,Nextcloud-Mail, Nextcloud-Notes, Nextcloud-Polls, Nextcloud-Spreed, Nextcloud-Talk, Nextcloud-Task
-=======
+
 # Exemples : Nextcloud-BigBlueButton, Nextcloud-Bookmark, Nextcloud-Calendar, Nextcloud-Carnet, Nextcloud-CollaboraOnline, Nextcloud-Onlyoffice, Nextcloud-Contacts, Nextcloud-Deck, Nextcloud-Forms,Nextcloud-Mail, Nextcloud-Maps, Nextcloud-News, Nextcloud-Notes, Nextcloud-Polls, Nextcloud-Spreed, Nextcloud-Talk, Nextcloud-Task
->>>>>>> 16e00a5 (upgrades apps)
 software.modules = Nextcloud-Calendar, Nextcloud-Contacts, Nextcloud-Notes, Nextcloud-Forms, Nextcloud-Task, Nextcloud-Deck, Nextcloud-Tables, Nextcloud-Passwords, Nextcloud-Draw.io, Nextcloud-Ownpad, Nextcloud-Mindmaps, Nextcloud-Talk, Nextcloud-Office...
 
 # [Host]