cards version
resolviendo conflictos