[falsedan]

I spent some time with `git mergetool` to help resolve conflicts. It's hideous but it's better than staring at inline conflict markers