Recommitting files overwritten

Somehow the files got overwritten by a pull. WTF