some changes to slime.js
fixed conflicts