Conflict Fix in button