diff --git a/check_process b/check_process
index 54286f7..e0d7b4c 100644
--- a/check_process
+++ b/check_process
@@ -24,7 +24,7 @@
 		# 10.6.4~ynh3
 		#upgrade=1	from_commit=5478712c0ca7683503bc1b50cfafe81ea508065e
 		# 10.7.0~ynh1
-		#upgrade=1	from_commit=63ab03ab79cc088a52b8a36fb4fdf5918bf0e14b
+		upgrade=1	from_commit=63ab03ab79cc088a52b8a36fb4fdf5918bf0e14b
 		backup_restore=1
 		multi_instance=0
 		port_already_use=0
diff --git a/scripts/backup b/scripts/backup
index 261bf40..0df06ee 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -51,7 +51,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 # SPECIFIC BACKUP
 #=================================================
-# BACKUP LOGROTATE
+# BACKUP VARIOUS FILES
 #=================================================
 
 ynh_backup --src_path="/etc/logrotate.d/$app"
diff --git a/scripts/restore b/scripts/restore
index 8f44002..6c7c4ec 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -121,12 +121,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15
 
-#=================================================
-# RESTORE THE LOGROTATE CONFIGURATION
-#=================================================
-
-ynh_restore_file --origin_path="/etc/logrotate.d/$app"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index d394fc8..6da156a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -63,10 +63,7 @@ if ! ynh_permission_exists --permission="admin"; then
 	# Create the required permissions
 	ynh_permission_create --permission="admin" --allowed=$admin
 fi
-<<<<<<< HEAD
 
-=======
->>>>>>> Add jellyfin to render group
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================