add slime-scratch
fix merge