The infamous spat between Bollywood biggie Shah Rukh Khan and editor Shirish Kunder might be nearing an end, but it is still unclear whether the duo will reunite for Farah Khan's "Happy New Year".

According to recent reports, Farah Khan's upcoming multi-starrer film with good friend Shah Rukh, Abhishek Bachchan, Deepika Padukone and Boman Irani was to have Shirish Kunder as an editor but the latter walked away citing work issues.

Speculations are now doing the rounds that Kunder might be roped on for the film on Farah's insistence, who is also Kunder's spouse. But the bigger question is whether Farah's good friend Shah Rukh will take the matter lightly or express discomfort, given the infamous history he shares with the "Joker" filmmaker.

"When Happy New Year was announced there was speculation whether Shirish would be part of the project given the history with Shah Rukh. To avoid the ugly past being raked up, Farah preferred that Shirish's name did not figure as editor. But now she feels that he is her best bet," a source told Mid Day.

And Farah's decision to bank on Shirish is obvious since she has worked previously with him in "Main Hoon Na", "Om Shanti Om" and "Tees Maar Khan."

"Farah has always worked with Shirish in all her directorial ventures. So obviously there is the comfort factor. For her, it is like when there is an editor at home, why even look elsewhere," added the source.

Even though SRK and Kunder are said to have patched up, there seems to be a certain discomfort between the two. SRK and Kunder have never been seen attending events together and Kundar was missing even during the Dubai shoot of the film.

SRK and Kunder fell out when the superstar allegedly slapped the latter at Sanjay Dutt's party last year. SRK is said to have got miffed with the director's antics and came to blows.

Post the incident, Farah took her husband's side and openly criticised SRK for the physical assault. However, she later went on to extend the olive branch to SRK and played a key role in the SRK-Kunder patch up.