added asteroids
fix conflict