Fixed major conflict