Correct the description of rebase conflict resolution