Resolve conflic

Signed-off-by: Thuy Dinh Xuan <thuydx@zendgroup.vn>