Fixing Email Conflict