Aurora Cannabis Inc. has struck a friendly deal valued at $1.1 billion to buy rival licensed producer CanniMed Therapeutics Inc., ending a hostile takeover battle between the Canadian marijuana companies.

“We are very pleased to have come to terms with CanniMed on this powerful strategic combination that will establish a best-in-class cannabis company with operations across Canada and around the world,” Aurora chief executive Terry Booth said.

“Market recognition of Aurora’s continued performance and strategy execution since we first announced our intention to acquire CanniMed allows us to share that benefit directly with CanniMed shareholders by increasing the offer price, as well as by offering a cash component.”

CanniMed had argued that Aurora’s earlier all-stock offer valued at up to $24 per share for the company was too low, given the wild swings in marijuana stocks.

The two appeared to have reached a truce last week, with the two agreeing to talks after a very public and litigious war of words.

Aurora’s new offer includes a cash component. Under the agreement announced Wednesday, CanniMed shareholders will receive 3.4 Aurora shares or a combination of cash and shares for each CanniMed share they hold. [Read more at CBC News]