fixed auto merge