Fix merge conflict resolution

Author: MateSaary

README.md

@@ -43,32 +43,32 @@ CAD consists of:
 
 1) [PagerDuty Webhooks](https://support.pagerduty.com/docs/webhooks) are used to trigger Configuration-Anomaly-Detection when a [PagerDuty incident](https://support.pagerduty.com/docs/incidents) is created
 2) The webhook routes to a [Tekton EventListener](https://tekton.dev/docs/triggers/eventlisteners/)
-3) Received webhooks are filtered by a [Tekton Interceptor](https://tekton.dev/docs/triggers/interceptors/) that uses the payload to evaluate whether the alert has an implemented handler function in `cadctl` or not. If there is no handler implemented, the alert is directly forwarded to a human SRE. 
+3) Received webhooks are filtered by a [Tekton Interceptor](https://tekton.dev/docs/triggers/interceptors/) that uses the payload to evaluate whether the alert has an implemented handler function in `cadctl` or not. If there is no handler implemented, the alert is directly forwarded to a human SRE.
 4) If `cadctl` implements a handler for the received payload/alert, a [Tekton PipelineRun](https://tekton.dev/docs/pipelines/pipelineruns/) is started.
-5) The pipeline runs `cadctl` which determines the handler function by itself based on the payload. 
+5) The pipeline runs `cadctl` which determines the handler function by itself based on the payload.
 
 ![CAD Overview](./images/cad_overview/cad_architecture_dark.png#gh-dark-mode-only)
 ![CAD Overview](./images/cad_overview/cad_architecture_light.png#gh-light-mode-only)
 
-## Contributing 
+## Contributing
 
 ### Building
 
-For build targets, see `make help`. 
+For build targets, see `make help`.
 
 ### Adding a new investigation
 
 CAD investigations are triggered by PagerDuty webhooks. Currently, CAD supports the following two formats of webhooks:
--  WebhookV3 
+-  WebhookV3
 -  EventOrchestrationWebhook
 
-The required investigation is identified by CAD based on the incident and its payload. 
+The required investigation is identified by CAD based on the incident and its payload.
 As PagerDuty itself does not provide finer granularity for webhooks than service-based, CAD filters out the alerts it should investigate. For more information, please refer to https://support.pagerduty.com/docs/webhooks.
 
 To add a new alert investigation:
 
 - run `make bootstrap-investigation` to generate boilerplate code in `pkg/investigations` (This creates the corresponding folder & .go file, and also appends the investigation to the `availableInvestigations` interface in `registry.go`.).
-- if the alert is not yet routed to CAD, add a webhook to the service your alert fires on. For production, the service should also have an escalation policy that escalates to SRE on CAD automation timeout.
+- investigation.Resources contain initialized clients for the clusters aws environment, ocm and more. See [Integrations](#integrations)
 
 ### Integrations
 
@@ -93,7 +93,7 @@ They are initialized for you and passed to the investigation via investigation.R
 - an existing cluster
 - an existing PagerDuty incident for the cluster and alert type that is being tested
 
-To quickly create an incident for a cluster_id, you can run `./test/generate_incident.sh <alertname> <clusterid>`. 
+To quickly create an incident for a cluster_id, you can run `./test/generate_incident.sh <alertname> <clusterid>`.
 Example usage:`./test/generate_incident.sh ClusterHasGoneMissing 2b94brrrrrrrrrrrrrrrrrrhkaj`.
 
 ### Running cadctl for an incident ID