do not rebase on conflict in trackupstream (bnc#839628)