Merge instead of rebase?