heroeController
heroeController fixed conflict