Projects >> ambari >>cc2d9341336218878af81bea0cc8ee7fc2a7d9ec

Chunk
Conflicting content 
        return new AlertResourceProvider(propertyIds, keyPropertyIds, managementController);
      case AlertDefinition:
        return new AlertDefinitionResourceProvider(propertyIds, keyPropertyIds, managementController);
<<<<<<< HEAD
      case AlertGroup:
        return new AlertGroupResourceProvider(propertyIds, keyPropertyIds, managementController);
      case AlertTarget:
        return new AlertTargetResourceProvider(propertyIds, keyPropertyIds, managementController);
      case Controller:
        return new ControllerResourceProvider(propertyIds, keyPropertyIds, managementController);
=======
>>>>>>> 811ea5860bfd27fb95aa5da04073835188742b89
      case ClientConfig:
        return new ClientConfigResourceProvider(propertyIds, keyPropertyIds, managementController);
      default:
Solution content 
        return new AlertResourceProvider(propertyIds, keyPropertyIds, managementController);
      case AlertDefinition:
        return new AlertDefinitionResourceProvider(propertyIds, keyPropertyIds, managementController);
      case AlertGroup:
        return new AlertGroupResourceProvider(propertyIds, keyPropertyIds, managementController);
      case AlertTarget:
        return new AlertTargetResourceProvider(propertyIds, keyPropertyIds, managementController);
      case ClientConfig:
        return new ClientConfigResourceProvider(propertyIds, keyPropertyIds, managementController);
      default:
File
AbstractControllerResourceProvider.java
Developer's decision
Combination
Kind of conflict
Case statement
Method invocation
Return statement