missed a variable assignment in the merge