Update MspJSON.txt
Fixed conflicts
Merge branch 'gitoac-patch-1'