solved  error merging