Fix merge conflict; why didn't I see this before, you ask?