Merge with conflicts.