Fix previous merge conflict for _Layout file