Bollywood filmmaker Farah Khan seems to have played peacemaker between Shah Rukh Khan and music composer duo Vishal-Shekhar.

Farah, who has roped in Vishal-Shekhar to compose scores for her upcoming film "Happy New Year" starring Shah Rukh Khan, apparently wants to end the rift between the actor and the composers so that all goes well with the entire cast and crew of the film.

The relationship between Shah Rukh and Vishal-Shekhar went sore after the former roped in rapper Yo Yo Honey Singh to croon a promotional track for "Chennai Express". Rumour has it that Vishal-Shekhar, who were the music composers of "Chennai Express", were unaware of Singh rendering the "Lungi Dance" song for the film. Even when reports of Shah Rukh teaming up with Singh surfaced, Vishal confidently said the rapper was not a part of the film's music.

But contrary to Vishal's claim, Shah Rukh roped in Singh for "Lungi Dance" and the song had Shah Rukh and Deepika Padukone grooving to the number. This was followed by rumours of a fallout between them. Vishal-Shekhar were even seen missing from the promotional events of the film.

However, latest buzz is that Farah, who is set to reunite with Shah Rukh for the second time after "Om Shanti Om", wants him and Vishal-Shekhar to get back on good terms. She had insisted that the composers attend the Eid party thrown by the superstar at his Bandra residence.

"Farah had decided long back that Vishal-Shekhar would score the music in her Shah Rukh starrer. The two did the music in her earlier directorial ventures Tees Maar Khan and Om Shanti On as well. Knowing that things could be uncomfortable, she decided to play peacemaker before her film goes on the floor," Mid Day quoted a source as saying.

"She made sure that they attend Shah Rukh's Eid bash even though Honey Singh was also on the guest list. As it was a festive happy occasion, the mood was set. They made up and things are like before now," the source added.

Farah also confirmed the reports of their patch-up saying, "It has all been sorted out; all's well."