added notEqual and notDeepEqual methods
managed merge conflict