Began moving collision into GameScene.
merge fix