removed merging error