fix error during merge