For the first time in years, Govinda and Krushna will share the same screen space on the upcoming episode of The Great Indian Kapil Show, officially putting the feud to rest