Missed a <p> in merge conflict