HungNgoc add trong file newTT
Giai quyet conflict