A conflict by merging