added exception_notification gem
fixed conflicts