Fixed card.rb conflicts.