removed temp file
merge