Fixed issue where data.json was not correctly merged