Merge and squash, stash alternative, delete branches, rebasing