deleted card view
update master
merging