Fixed edit_team_member
Fixed edit_team_member; I think the merge worked, too...