alejandro and christian
fixed m conflict card.rb