resolve conflicts in gitlab ui