merge hero change