Fixed JSON syntax errors from branch merge conflict resolution.