add heros: nora and xavier.
Fix conflicts while editing