Change default merge strategy from Merge -> Squash and Merge

[vprajapati-tt]

Apologies, this issue made it's way to the main repo. This was made for a fork.

[pkgoogle]

Hi @yijie-yang, can you please take a look? Thanks.