In Acts 15, the early church addressed the question of the requirements for salvation.  In doing so, they also set a good example for how to handle conflict in the church.