fix error caused by merge