fixed merge conflict in invites controller