added squash commit