SpaceX president Gwynne Shotwell said the two companies are working towards the same goal, and didn't rule out a merger with Tesla in the future.