merge --squash persona branch to take care of a false merge commit in