fix merge issue
fix merge issue

rlugojr/jsonlintdotcom,arc90/jsonlintdotcom,robbrucker/jsonlintdotcom,circlecell/jsonlintdotcom,rlugojr/jsonlintdotcom,arc90/jsonlintdotcom,robbrucker/jsonlintdotcom,arc90/jsonlintdotcom,rlugojr/jsonlintdotcom,circlecell/jsonlintdotcom,circlecell/jsonlintdotcom