notification changes and other patient updates
resolving merges