deal with conflict after merging NSNotificationCenter