Solving a year-long dispute about SpaceX