Both, as I don't accept the conflict thesis as fact. I entertain a belief that a divine hand plays a role in leading evolution. I believe it to be foolish to assume that we understand the Lord so perfectly that we can deny the nature of the world to reaffirm our own understanding therein.
@triangle.128k Theistic Evolution is also known as Evolutionary Creationism, and rests in the sphere of "Old Earth Creationism". What you are referring to is "Young Earth Creationism", which is where the pseudo-scientific idea of "Creation Science" comes from. What I, as well as what I assume Texas14 amd michaeln23, refer to is simply Creationism. Unimposed by the definitions applied by either school, where it is simply creation by divine means.
Creation is the only logical explanation. Read this article to see how Evolution simply doesn't make any sense: http://thetruthwins.com/archives/44-reasons-why-evolution-is-just-a-fairy-tale-for-adults