Final fix for merge issues

put collision detection back in