chore(demo): update demo page content
chore(main): merge branch