add few heros: Cristina to Luis
Fix conflicts in hero model