Merge and resolve