fix api conflict