Hi, Just a quick warning: Do not use the online merge conflict resolver of GitLab. It can break your remote copy of the repository in a way that you can't fix yourself. And it looks like GitLab staff is not actually helping... I broke my Postorius remote https://gitlab.com/gitlab-com/support-forum/issues/1114 be careful, Simon