gitlab merge request view conflicts