Added bean-list and bean-card
Resolve conflicts