The top lawyer for the National Rifle Association’s Institute for Legislative Action and his former boss at a Frisco, Texas-based video game company dismissed their lawsuits Thursday against each other.

Wade Callender, the general counsel of the NRA, and Randall Pitchford II, CEO of Gearbox Software LLC, largely known for developing the “Borderlands” video game series, agreed to drop their suits against each other with prejudice after coming to an agreement and an apology, according to court documents.