Fixed JSON parsing bugs after wrong merge action