Testing merge conflicts resolution with CI
Will be discarded once CI runs
Maintenance operation of our GitLab server is scheduled for Thursday, November 28 at noon. The server will be unavailable for about two hours.
Will be discarded once CI runs