Converting to twig
Refatoring with twig
Solving conflicts