AJAX parsing thru JSON
Fix conflicts