udpated error page messages
merging files
merging files