Working on email notifications
Resolving conflicts