them code
Sua line 23
Giai quyet conflict voi ThanhThai