feat(demo): fix modals
fix conflict