fixed post request and error return
fixed merge