fixed error in merge