bug fix & to aliyun ready
confilct