Fix incorrect merges