repair auto merge