merge resolve diff