api document refreshed
conflict fixed