Fix syntax error in ajax
Fix merge conflict with ajax.py