info cards
conflict resolved