merge resolving