Add detail regarding git rebase conflicts