added replace string in files
merge