Corrected files

Merged the wrong things, but fixed it