merge-heroes-fix