The Qur'an itself explains what to do with conflicting verses. If two passages conflict, it says, the one written later is better than the one written earlier.
The bad news for non-Muslims is that almost all the peaceful passages were written earlier, and the violent ones were written later.