merge conflicts gitlab