merge conflict correct
spaceship almost complete