Fixed a bad merge

Your merge is broken. It's fixed now with json gem updated.