# Conflicts:
#   src/app/(main)/_lib/layout/MenuItem.tsx
#   src/app/(main)/thong-tin-truyen-thong/an-pham/page.tsx
#   src/components/base/list-category/index.tsx

Feat/home page

See merge request !8

update/final page

See merge request !6

Feat/home page

See merge request !5

# Conflicts:
#   src/app/(main)/hoi-vien/ket-noi-hoi-vien/page.tsx
#   src/app/(main)/hoi-vien/tin-hoi-vien/page.tsx

feature/product_origin_page

See merge request !4

Feature/home page and members page

See merge request !3

Feature/home page

See merge request !1

Msdasderge branch 'feature/home_page' of https://gitlab.meu-solutions.com/vanhoangit/vcci-news into feature/home_page