Tinder has ended a strange battle with a prominent AIDS organization by adding a “Health Safety” section on its website.

The new web page provides information on condum use and a way to find a free testing facility for sexually transmitted diseases (STDs), according to an Engadget report.

The AIDS Health Foundation has been in a battle with Tinder for months to get such information added to the popular hook-up app. The AHF started an advertising campaign that used the Tinder and Grindr logos, displayed next to a silhouette with the name of a sexually transmitted disease. The campaign sought to urge users of these apps to get free STD testing, but Tinder responded angrily with accusations that the non-profit was being dishonest about the connection between Tinder and STDs.

But AHF stood their ground, and kept their billboards up.

Tinder has appeared to have squashed the beef, at least for now. They have started linking useres to the Healthvana STD testing locator, and AHF in response is planning on taking down the billboards and other advertisements.

“Tinder empowers our users to create relationships,” Tinder’s site states. “An important aspect of any healthy relationship – whether formed on Tinder or otherwise – is ensuring proper sexual health and safety.”

The site urges users to use proper protection like condoms, to be open and honest with a partner regarding sex, to get tested regularly, and to get vaccinations that can help you avoid STDs in the first place.