Git rebase conflict use theirs