fixed the summary cards that got screwed in the conflict merge