Fix bad merge conflict resolution from pronouns
Fix bad merge conflict resolution from pronouns

in the previous commit we had a merge conflict and we resolved it
Incorrectly, this fixes that.

Test plan:
* you shouldn’t get a JS error when opening the profile tray

Change-Id: I6595b1cb68c4c4ac56a2819a1e08d6869b2cafba
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/216023
Reviewed-by: Jacob Burroughs <8ecea6e385af5cf9f53123f5ca17fb5fd6a6d4b2@instructure.com>
Tested-by: Ryan Shaw <ea3cd978650417470535f3a4725b6b5042a6ab59@instructure.com>
QA-Review: Ryan Shaw <ea3cd978650417470535f3a4725b6b5042a6ab59@instructure.com>
Product-Review: Ryan Shaw <ea3cd978650417470535f3a4725b6b5042a6ab59@instructure.com>

sfu/canvas-lms,djbender/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,sfu/canvas-lms