Merge 404 page into CMS