try to fix Card.java
try to fix conflict problems
try to fix conflict errors
aux to auxiliary