As long as you take bible literally, the conflict is not going away (unless the society decides to turn back time). I think bible can be understood as a product of it's time without taking away its meaning. Quite a lot of it is outdated, but that doesn't mean that the basic idea is.
I think the religions should change. They are to give people a moral code (I know you can have moral without religion, but this doesn't happen for everyone). This is the most important function of religion. If the religion doesn't change, the people will drop it because its not working in the current society. After this you have a society based on market value.