Squash local changes 99