Fixed notification when branch gets new commit
Fixed merge errors