Or at least, rebasing without conflicts