fix error introduced in merging