update heros: pets
update heros: chorni
Fix conflicts in heros