cascading added
notification changed
conficts resolved