Git Lab Merge Conflicts