Socialite and media personality Kendall Jenner has settled a lawsuit brought against her by Tequila 512. The Austin-based company was suing Jenner for trademark infringement. Tequila 512 argued Jenner’s tequila brand, 818 Tequila, copied its logo and color scheme.

According to Tequila 512 CEO Nick Matzorkis, the company has dropped the suit. “Tequila 512’s lawsuit against 818 Tequila has been resolved,” he told TMZ. “The parties have agreed that they will each have the right to use their existing names and they will both make changes to their labels to clarify that they are not related to each other. Tequila 512 has dismissed its case.”

The original lawsuit claimed that 818 Tequila used an “immediately recognizable 512 mark in black lettering inside a vertical yellow rectangle” and used some of its other branding with “immaterial tweaks.” Tequila 512 gives a nod to the area code used in Austin, Texas. 818 Tequila does the same for the San Fernando Valley in northern Los Angeles.

According to TMZ, Tequila 512 will add the phrase “Est. 2012” to its label. It is not known what changes 818 Tequila will make as part of the deal.

Last year, Kendall Jenner was accused of cultural appropriation by the Latine community when she launched an advertising campaign for 818 Tequila and came across many critics as being tone-deaf. The ads include Jenner riding on horseback through agave fields in Mexico, drinking tequila on the back of a shoddy pickup truck, and portraying what some people felt was her take on what a “migrant” or “indigenous” woman looks like.