added make_heroes_image.pro
fixed merge conflict