resolved conflict with layout.html