Collisions fixed. Were on separate layers
merge fix