repair failed merge && handle errors from simplejson library
remove stray print
add pretty space