Restored the files that were overwritten

Restored the files that were overwritten in the last merge.