Squashed rebase