teachings on conflict