Yes, there has been conflict between science
& Christianity, just as there has been conflict
within Christianity and within science.
No, there is no need to see this as necessary
conflict, so long as one does not define
science so as to rule out the supernatural and
miraculous in the history of the universe.