[client][managed][offline] Improved handling for 409 conflicts