gitlab no resolve conflicts button