error merging -______________-