Test conflicts

Resolver conflicto ee