Notification and tip of the day completed phew finally..
Conflicts resolved.