ajax delete
resolviendo conflicto git