schema added
info cards
conflict resolved