Parse files with json
fixes
fix merge