Not very good, but rebase vs. merge.