resolving conflict vs entrenching it