Using contextDidSave notifications to perform merges