conflicts fixed
Notification progress implementation