adding ajax
fix merge conflict cases/show