Squash all the commits again