Merge resolvement