Re-adding 'mergeChangesFromContextDidSaveNotification' method call. Maintaining fallback mechanism as well