Updated notifications
Merge solved