update trang thai con thu
fix conflict projectsetting