Test branch squash take 2