Missed a merge message that caused an error--fixed