fixing auto merge