Tesla says it has resolved a Chinese trademark dispute E-mail Tweet Facebook Google Plus Linkedin Share icons by Ben Geier @FortuneMagazine August 6, 2014, 9:13 AM EDT Elon Musk wants to take his electric cars to China, the world’s biggest auto market. He’s been running into one problem, though: someone already had a trademark on the name “Tesla.” That shouldn’t be a problem anymore, according to a Reuters report, which says Musk has settled his dispute with Chinese businessman Zhan Baosheng “completely and amicably.” Musk and Bapsheng had previously announced a settlement in January, but it didn’t hold as Baosheng eventually filed to take Tesla TSLA to court. Other companies, such as Apple and Unilever, have had trademark disputes in China. Apple, for instance, paid $60 million in 2012 for the right to call its tablets iPads in the country. Tesla announced further international expansion earlier this year, including moving into markets with left-hand driving, such as the U.K. and Japan. Teslaphiles are also eagerly awaiting the release of the Model X, which is currently teased on the manufacturer’s website. WATCH: Tesla reports strong Q2 earnings trumping Wall Street estimates.