Past fights buried, SAD rivals with BJP are back as joint candidates