maybe I should clean this stuff up more often
I need to learn how to use vimdiff