removed json from main.js
fixed merged conflicts