A fight between fighting styles just got settled by a court in China