git merge squash