fix merge side effect