fix last 2 commits must squash