fixed data api
resolved merge