Used the wrong code when I resolved the conflict from the pull request.