nullObj is a singleton
fix merge conflict