ajax replacement
solving merge conflict