testing squashing and rebasing