Orbitz Worldwide Inc. and American Airlines (AA) have ended their two-year battle over travel distribution costs and methods.

The two companies entered into a settlement, details of which have not been disclosed, that must still be approved by the bankruptcy court presiding over AA’s parent AMR Corp.’s Chapter 11 bankruptcy emergence. The airline filed for bankruptcy in 2011, and announced last month that its planned merger with US Airways as part of its bankruptcy plan had been approved.

AA sued Orbitz in 2011, claiming the online travel agency as well as its airfare data provider Travelport presented AA’s fares as higher than the competing airlines on the site. Travelport owns 48 percent of Orbitz.

Read more recent news about the airline industry on InsideCounsel:

American Airlines-US Airways merger approved

Court upholds dismissal of Boeing investor lawsuit, considers sanctions against plaintiffs’ attorneys

Judge revives case against United Airlines over wheelchair