SAN FRANCISCO >> In a series of tweets Monday, Elon Musk, the owner of Twitter, accused Apple of sabotaging his social media company by cutting back advertising and threatening to remove the Twitter app from the App Store.

By Wednesday, any potential feud appeared to have been avoided.

On Twitter, Musk posted a video of himself being shown around Apple’s campus in Cupertino, California, on Wednesday, walking past a meditation pool. While the video did not show whom Musk was walking with, Apple employees said they had seen Musk with Tim Cook, Apple’s CEO. Musk said in a later post that he and Cook had discussed their dispute.

“We resolved the misunderstanding about Twitter potentially being removed from the App Store,” Musk said in a tweet. “Tim was clear that Apple never considered doing so.”

Apple declined to comment. Musk did not respond to a request for comment.

The meeting appeared to sidestep what had threatened to become a big spat between two of tech’s titans. Musk had taken aim at Apple’s power over the App Store, which is the only distributor of apps on more than 1 billion iPhones worldwide. His complaints — about Apple’s policies for approving apps and its practice of taking a cut of the sale of apps — resurrected an issue that had been raised by other companies, such as Spotify and Epic Games. Lawmakers and regulators around the world have been scrutinizing Apple’s power over software distribution.

Under Musk, who took over in October, Twitter’s content policies have been unclear, potentially putting the app at odds with Apple, which reviews every app distributed through the App Store.

Musk has reinstated the account of former President Donald Trump, which was banned after the Jan. 6, 2021, riot at the U.S. Capitol, and has said he will offer amnesty to accounts suspended by the company’s previous leadership. But Apple’s rules prohibit hateful speech or content. The company also polices apps to be sure that they use its in-app payment system to collect subscriptions, which allows Apple to collect as much as 30% of sales.

In the past, Apple has raised concerns with developers that defy those policies and slowed down approval of their apps for distribution. Musk said Monday that Apple had threatened to do the same with Twitter without telling the social media company why.

Cook gave Musk the tour before a scheduled trip to Washington, where he is set to meet with several Republican lawmakers, including Reps. Jim Jordan of Ohio and Cathy McMorris Rodgers of Washington, according to a person with knowledge of the matter. A conflict with Musk had threatened to complicate those meetings because he accused Apple of trying to censor “free speech” by limiting Twitter’s distribution on iPhones — an issue in Congress, where Republican leaders are concerned that Silicon Valley companies suppress conservative views.

Cook has used charm offensives before. After Trump criticized Apple in 2018 for manufacturing its products overseas, Cook traveled to Washington to meet with him and joined a White House advisory panel. Trump later abandoned his criticisms of Apple and praised Cook as a “great executive because he calls me and others don’t.”

This article originally appeared in The New York Times.