changed the 404 page
merging