add conflict alchemy_taotao