Niki Lauda claims Lewis Hamilton has accepted his loss to Nico Rosberg at the Monaco Grand Prix, but admitted that the situation in the Mercedes garage is still 'tricky'.
After the Mercedes pair fell out in the Principality, Hamilton took to Twitter to reveal that he and Rosberg were cool" and "still friends".
Speaking to the Osterreich newspaper, Lauda - who is the non-executive chairman at Mercedes - revealed Hamilton has come to grips with his second place in Monaco, but added that the situation could flare up again at any point this season.
"Lewis has now accepted Nico won in Monaco and he was second, which is really no shame," Lauda, himself a three-time World Champion, told the Osterreich newspaper.
"In Montreal (for this weekend's Canadian Grand Prix) we will get together again and discuss everything. After that the fight will go on for the world championship, with both in equal cars.
"But with two alphas currently sitting in the best car it is tricky, although given our superiority that in turn makes the races interesting.
"But we will let our drivers race against each other without restriction because whilst tension is quite normal, it can also escalate. Then I get involved as a mentor.
"Nico was clearly faster in Monte-Carlo, but now Lewis will do everything he can to fight back.
"It is a strain on our nerves, but for the fans and the sport there is nothing better."