Ending a long-running conflict of interest dispute, Covington & Burling has agreed to settle claims that it betrayed its obligations to onetime client 3M Co.

The deal was confirmed Friday by 3M’s outside lawyer. It resolves claims of breach of contract and fiduciary duty against Covington related to an environmental case the firm brought against 3M on behalf of Minnesota Attorney General Lori Swanson.