added a sample JSON method
fixed merge conflicts