missed a comma in the merge