re-fixed regexps for diffs after a git merge
checked/fixed some notify tests