Resolvido checkout conflict