added 404 page
merging