I'm never fixing a merge conflict again (yes it all worked at the end) (yes I probably should have made the original changes with more of an awareness of what my coworker was doing)
---
Only took 30 minutes and $7
