fix error made during merge