Have Sunil Grover and Kapil Sharma finally buried the hatchet?