It's time to rebase instead of merge.