fix conflict
Merge branch 'master' of https://github.com/datht09/eProjectS4G2