add conflict alchemy_taotao
merge the conflicts