fixed malformed json
Merge branch 'paddatrapper-dev'
fix merge conflict