making sure that files and pages are merged together for now