Parsing JSON
fixed conflicts
merge conflict