correcting from an auto merge