merge resolve conflict