fixed the usage of the tmp object in getDiff
added script to merge to json object files