Merged files

Merged the two files