Squash messy rebase