add collidable in w1.js
merge conflicts