Fixed merge issue with default layout