The row that threatened to mar Monday's London Parade for Britain's Olympic medal winners has been resolved.
Mark Lewis-Francis won gold in the 4x100m relay in Athens
Athlete Mark Lewis-Francis and cyclist Bradley Wiggins were in danger of missing the procession because of demands made by their sponsors Nike.
But the sportswear manufacturer has agreed to let both men wear the Team GB tracksuit, made by Adidas, instead.
"We are extremely grateful to Nike," said a British Olympic Association statement on Wednesday.
Nike had argued that the deal requiring their athletes to wear official Team GB kit had expired seven days after the Olympic closing ceremony.
But after discussions between the two parties, both athletes will attend the parade in full GB kit.
The BOA's Phillip Pope added: "We are delighted and grateful to Nike for understanding what we are trying to do in the wider context of GB sport.
"We are grateful to their executives for their speedy response.
"It was an unusual situation that we are in as it is so late in order to recognise the success of the Paralympic athletes.
"It is not commercially driven, it is an issue of practicality. The common thing that links the Olympic and the Paralympic athletes is the GB kit."
Organisers are now looking forward to Monday's parade which should see thousands of people lining London's streets to pay tribute to their Olympic heroes.
All but two of Britain's medal winners are believed to be appearing.
Pope added: "I have had enquiries from all over the country asking us for details about the parade and we hope to have tens of thousands of people there."
The parade is set to start at around 1345BST on Piccadilly and will end up on the north terrace of Trafalgar Square.
The floats taking the medal winners will travel down Piccadilly to Piccadilly Circus before turning onto Haymarket, into Pall Mall East before reaching Trafalgar Square.