Update the perk manager to display the cards and to remove merge conflicts

[nicholasyung1]

Acknowledging that we are committing the same conflict fixes, removing my PR.