add missing setBack function to SpaceShip
fix merge errors in main, CMakeLists