Conflict

How should a disciple of Jesus Christ deal with conflict? Should we avoid it, or grow in the way we deal with it?