merge --squash simplify