fixed an error during merge