make sure all tests pass after the merge conflict

[josephlee702]

____ Wrote Tests ____ Implemented ____ Reviewed

Neccesary checkmarks:

[x] All Tests are Passing

[] The code will run locally

Type of change

[] New feature
[x] Bug Fix (made sure all the tests pass after our last merge conflict issue).

Implements/Fixes:

description closes #

Check the correct boxes

[x] This broke nothing
[] This broke some stuff
[] This broke everything

Testing Changes

[] No Tests have been changed
[x] Some Tests have been changed (just routing stuff)
[] All of the Tests have been changed(Please describe what in the world happened)

Checklist:

[x] My code has no unused/commented out code
[x] I have reviewed my code
[x] I have commented my code, particularly in hard-to-understand areas
[x] I have fully tested my code

(For Fun!)Please Include a link to a gif of your feelings about this branch

Link:

[kameronk92]

Nice work on this, thanks for getting it resolved!