FIX::conflicts