App deployed, json rendered
merge conflict in html