Some random changes...

I honestly don't remember doing anything, so I'm not sure what this all
is.
Fixed Merge Conflict