In a surprising turn of events, singer-rapper Badshah publicly resolved his decade-long feud with fellow artist Honey Singh during a…