link invitation acceptance to email
resolving merge conflict