fixed conflict hero.html.twig