fix error in merge