saving notifs
fixed merge
fixed my mistake on merge