fixxed merge conflict in hero unit div