commit 27/11 code gan xong