Broken, pt. 4: Relationship Repair

Unresolved conflict -- broken relationships between people who claim to be followers of Christ -- is the reason many unchurched people want no part of church.  We often try to pretend such conflict doesn't exist.  What does the Bible say about conflict?  What should we do when this happens to us or to other Christians?