fix error causes by merge