Conflict resolve test
Merge branch 'master' of ssh://github.com/TrungACZNE/hypermarket_group12