changed default json data file
merge