Test merging with conflicts.