merge nhan's brand #6

Closed syhcmus closed 2 years ago