The “war” that was reportedly brewing between Blac Chyna and the Kardashians over a family name trademark has been squashed.