diff --git a/manifest.toml b/manifest.toml
index d90779b..b638ba5 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -68,8 +68,3 @@ ram.runtime = "50M"
[resources.apt]
packages = "curl, mediainfo, sqlite3"
-<<<<<<< HEAD
-
-=======
-
->>>>>>> 64e384b (v2)
diff --git a/scripts/change_url b/scripts/change_url
index 1abcb0a..31c6be8 100755
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -31,15 +31,7 @@ ynh_change_url_nginx_config
# UPDATE CONFIGURATION FILE
#=================================================
-<<<<<<< HEAD
ynh_replace_string --match_string="$old_path" --replace_string="$new_path" --target_file="$data_dir/config.xml"
-=======
-ynh_exec_warn_less 'ynh_add_config --template="config.xml" --destination="$data_dir/config.xml"'
-
-chmod 750 "$data_dir/config.xml"
-chmod o-rwx "$data_dir/config.xml"
-chown $app "$data_dir/config.xml"
->>>>>>> 64e384b (v2)
#=================================================
# GENERIC FINALISATION
diff --git a/scripts/remove b/scripts/remove
index 74439e0..f7bd6fd 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,15 +10,9 @@ source _common.sh
source /usr/share/yunohost/helpers
#=================================================
-<<<<<<< HEAD
# REMOVE SYSTEM CONFIGURATIONS
#=================================================
-# REMOVE SYSTEMD SERVICE
-=======
-# STANDARD REMOVE
-#=================================================
-# REMOVE SERVICE INTEGRATION IN YUNOHOST
->>>>>>> 64e384b (v2)
+# REMOVE SYSTEMD SERVICE
#=================================================
ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
@@ -38,12 +32,9 @@ ynh_remove_nginx_config
# Remove the app-specific logrotate config
ynh_remove_logrotate
-<<<<<<< HEAD
# Remove the log files
ynh_secure_remove --file="/var/log/$app"
-=======
->>>>>>> 64e384b (v2)
#=================================================
# END OF SCRIPT
#=================================================