F: fix json syntax error
F: merge conflict