email notifications bugfix
resolving conflicts
resolving conflicts 3
conflicts 4