auto merge resolving