Resolving conflict? Matthew 5:21-24, 18:15