Squash commits from CM