branch pull with conflict