The months long feud between Expedia (Nasdaq: EXPE) and American Airlines parent AMR (NYSE: AMR) is over.

The two parties are ready to begin working together again, agreeing to let Expedia visitors book flights on American and American Eagle.

Portals and legacy carriers haven't been playing nice since December, when AMR broke free from Orbitz Worldwide (NYSE: OWW) over pricing and rate publishing methods. Expedia's Hotwire and its namesake portal joined Orbitz in offering American-free deals. Airlines naturally want to book passengers directly to save on commissions, but they also risk losing potential passengers if their rates and schedules aren't available on the popular travel booking websites.

AMR wasn't blackballed everywhere. The "name your price" juggernaut Priceline.com (Nasdaq: PCLN) never stopped publishing American flights. Kayak, Microsoft's (Nasdaq: MSFT) Bing Travel, and other comparison shopping sites never missed a beat. Travel deals publisher Travelzoo (Nasdaq: TZOO) didn't face any new restrictions in lining up its subsidized offers.

However, a tussle between one of the largest airlines and one of the largest travel portals was ultimately damaging to consumers. No one likes uncertainty, and that's just what happens when a portal visitor isn't sure to be receiving all of the available options.

The end of one battle doesn't mean that the war is over. AMR and Orbitz have yet to make nice. In fact, Orbitz parted ways with auto rental giant Enterprise on its site just last week.

No one said it wouldn't be a bumpy flight.

Who do you think is right in this battle? Share your thoughts in the comment box below.

This article represents the opinion of the writer, who may disagree with the “official” recommendation position of a Motley Fool premium advisory service. We’re motley! Questioning an investing thesis -- even one of our own -- helps us all think critically about investing and make decisions that help us become smarter, happier, and richer.