Committing merged files

Committing the manually merged files