Squash via merge and reset origin