Redo this file, somehow a merge borked up the line endings or something