Null conflicts are null rather than "null"

Somehow this file got left out of the last commit