the first time i had to deal with a huge git rebase conflict