Feuding Force India team-mates Paul di Resta and Adrian Sutil said on Thursday that they have buried the hatchet after their clash at last weekend's Chinese Grand Prix.
German Sutil collided with Briton Di Resta and ran him off the circuit as they fought in a pack of cars on the opening lap of the race in Shanghai.
Sutil was taken out of the race soon after another incident involving Sauber's Mexican driver Esteban Butierrez while Di Resta recovered from the initial collision to finish a strong eighth.
Force India team chief Bob Fernley said the team would address the issues arising from the opening lap crash and on Thursday confirmed that the drivers had talked and cleared the air.
"Most importantly we looked at it, we spoke about it and that's it," he said at the Manama circuit, where the Bahrain GP will be held on Sunday.
"There are worse scenarios here in this paddock between team-mates."
Both drivers confirmed they had spoken and they agreed that their battle was now over.
"We talked about it and it's all over now," said Di Resta.
Sutil added: "You have to race hard and to race everyone... We have talked about it and it is over. There are no hard feelings."