git rid of isNull
merge changes, cleanup