missed a line in merge