Fix merge

It looks like the merge wasn't totally fixed, but I think I've finished it.

I'm running the wrong version of Ruby, so I didn't try compiling it.