css-tylized the deck list
fix conflicts