big commit of member views and card
fixedconflict