fixed error: don't close the file pointer
merge files and fixed one error :)