fix merge error from f74ed745e09010f1286a62004d67cdecf15d3213