GitLab team-member here.

GitLab also detects if there is a conflict on a merge request as things change and will notify the user