Use squash-merge-commit instead of merge-commit (#333)

Use squash-merge-commit instead of merge-commit (#333) #810