fix missed merge error