update squash
step 2 in squash