adding json converter
resolving merge conflict