Merge Conflicts Fix #2

Fixes BlueRaja/WebAndForeignInvImprovements PR merge conflicts.