Bollywood family feud resolved