Squash commits from slim