fixed error

fixed the errors due to merging files.