Added color to see friendly ships. fixed collisions
fix conflict