add ajax
 merge conflict Resoved