adding checkinf for conflicts and sending email