diff --git a/scripts/upgrade b/scripts/upgrade
index 67edb38..43b4ac7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -30,9 +30,20 @@ db_pwd=$(ynh_app_setting_get --app="$app" --key=db_pwd)
 
 datadir=$(ynh_app_setting_get --app="$app" --key=datadir)
 
+<<<<<<< HEAD
 instance_expose_peers=$(ynh_app_setting_get --app="$app" --key=instance_expose_peers)
 instance_expose_suspended=$(ynh_app_setting_get --app="$app" --key=instance_expose_suspended)
 
+accounts_registration_open=$(ynh_app_setting_get --app="$app" --key=accounts_registration_open)
+accounts_approval_required=$(ynh_app_setting_get --app="$app" --key=accounts_approval_required)
+accounts_reason_required=$(ynh_app_setting_get --app="$app" --key=accounts_reason_required)
+=======
+# reliquat <0.3.7~ynh1
+registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
+registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)
+registration_reason=$(ynh_app_setting_get --app="$app" --key=registration_reason)
+>>>>>>> f6dad82 (fix ynh_app_setting_get for accounts settings)
+
 accounts_registration_open=$(ynh_app_setting_get --app="$app" --key=accounts_registration_open)
 accounts_approval_required=$(ynh_app_setting_get --app="$app" --key=accounts_approval_required)
 accounts_reason_required=$(ynh_app_setting_get --app="$app" --key=accounts_reason_required)