Merge and resolve conflict