changed sword collision
merge conflicts