Fix old merge problems

Signed-off-by: Pete Wall <pete.wall@grafana.com>

Author: petewall

README.md

@@ -11,13 +11,8 @@ The Alloy Operator is a Kubernetes Operator that manages the lifecycle of
 
 | Component        | Version |
 |------------------|---------|
-<<<<<<< HEAD
 | Alloy Operator   | 0.4.0 |
-| Alloy Helm chart | 1.5.1 |
-=======
-| Alloy Operator   | 0.3.15 |
 | Alloy Helm chart | 1.5.2 |
->>>>>>> f0d0f5d (Update Alloy Helm chart to 1.5.2)
 | Alloy binary     | v1.12.1 |
 
 [//]: # (Version table end)

charts/alloy-operator/Chart.yaml

@@ -6,13 +6,8 @@ icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_
 sources:
   - https://github.com/grafana/alloy-operator
 type: application
-<<<<<<< HEAD
 version: 0.4.0
-appVersion: "1.5.1"
-=======
-version: 0.3.15
 appVersion: "1.5.2"
->>>>>>> f0d0f5d (Update Alloy Helm chart to 1.5.2)
 maintainers:
   - email: pete.wall@grafana.com
     name: petewall

charts/alloy-operator/README.md

@@ -5,11 +5,7 @@
 
 # alloy-operator
 
-<<<<<<< HEAD
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.1](https://img.shields.io/badge/AppVersion-1.5.1-informational?style=flat-square)
-=======
-![Version: 0.3.15](https://img.shields.io/badge/Version-0.3.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.2](https://img.shields.io/badge/AppVersion-1.5.2-informational?style=flat-square)
->>>>>>> f0d0f5d (Update Alloy Helm chart to 1.5.2)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.2](https://img.shields.io/badge/AppVersion-1.5.2-informational?style=flat-square)
 
 A Helm chart the Alloy Operator, a project to innovate on creating instances of Grafana Alloy.