fix merge error after b4b4d9697fa43a526466165a3ca89d058296cb04