fix where I didn't save my merge conflict file

[ChrisMKindred]

What does this do/fix?

Removes the leftover merge conflict lines from my previous commit. 😞

Tests

Does this have tests?

• [ ] Yes
• [X] No, this doesn't need tests because.
• [ ] No, I need help figuring out how to write the tests.