notification bugs
merge conflits