Test merge conflict resolution.