Adding files for the merge