Flatten and rebase onto master