Fix _layout template
Fix conflicts