'Nother Merging Conflict