correction conflict layout.phtml