completed json
fixed merge