Fixed merge problem with layout

Signed-off-by: drandx <garjuanpablo@gmail.com>