Missed a merge conflict