fix bug gladiators
tournaments
fix merge