notification on page reload
fixed merge ocnflicts