Conflicting copy/merging test