fix missed merge