Fix Merge Derps!

I somehow messed up and pushed this without realizing I had missed these files....