Test: Merge with conflicts