fix error after merging