Is there a conflict between Buddhism and Taoism?

In ancient China, Buddhism and Taoism were antagonistic and integrated with each other. Buddhism is atheism and Taoism is polytheism, so the contradiction is not small. However, since Buddhism was introduced into China, there has been a serious phenomenon of China, which absorbed a lot of thoughts and behaviors of Confucianism and Taoism, and so did Taoism. Taoism also imitates Buddhism in practice methods and behaviors, especially Quanzhen religion in Song Dynasty, and advocates the unity of three religions (Confucianism, Buddhism and Taoism). Buddhism doesn't travel everywhere, it's called travel. It is about cultivating good deeds, doing good deeds and accumulating good virtues. This is a kind of cultivation. Just look at the story of Jigong.