merging error, adding again
fixing error in merge