Merging mistakes