XXX: squash to HEAD~