Testing notification-handling
Fixed Conflicts