notifications merge conflict