Setting colors per card
Fixing merge issues