Added collision detection to movement
merge
fixed build errors