Resolve merge conflicts

    <description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.

    It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.

    This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>

    <version>6.1.1</version>

    <version>6.1.2</version>

    <licence>agpl</licence>

    <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>

    <namespace>EcloudAccounts</namespace>

	private $session;

	private $userSession;

	private $urlGenerator;

	private $initialState;

	/** @var IConfig */

	private IConfig $config;

	private IInitialState $initialState;

	private const SESSION_USERNAME_CHECK = 'username_check_passed';

	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';

	private const ALLOWED_CAPTCHA_PROVIDERS = ['image', 'hcaptcha'];

		}

		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = $lang;

		$this->initialState->provideInitialState('lang', $lang);

		$response = new TemplateResponse(

			Application::APP_ID,

import Axios from '@nextcloud/axios'

import Password from 'vue-password-strength-meter'

import { generateUrl } from '@nextcloud/router'

import { loadState } from '@nextcloud/initial-state'

const APPLICATION_NAME = 'ecloud-accounts'

export default {

		},

	},

	created() {

		const currentURL = window.location.href

		const urlSegments = currentURL.split('/')

		this.formData.selectedLanguage = 'en'

		if (urlSegments.length === 8) {

			this.formData.selectedLanguage = urlSegments[urlSegments.length - 2]

		}

		this.formData.selectedLanguage = loadState(this.appName, 'lang')

	},

	methods: {

		validateForm(fieldsToValidate) {