add ajax
 merge conflict Resoved
git conflict resolved
Merge branch 'karthik339-master'