Adidas won't be blocking a Black Lives Matter trademark application after all