again a merge error