conflict and resolution