Handle git-finish merge conflicts (close #13)