fetch rebase conflict resolution