working ajax
fixed merge conflicts