conflict readme