Fixed the merge issue

Conflicts:

	layout/index.html.twig