testing merge --squash