Adidas ends its war with Black Lives Matter over a ‘confusingly similar’ triple-stripe mark used on its merchandise for decades