Blah. stupid git rebase merge conflicts