base commit plus squashes