#1012-card hierarchy develop
#1014-conflict fixed