Resolving conflict in PendingInvitation.php