Formula One Grand Prix, the conflict is resolved