Serve up data.json
Fix merge