diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml
index d7977b1f..3a38dea3 100644
--- a/charts/operator-wandb/Chart.yaml
+++ b/charts/operator-wandb/Chart.yaml
@@ -1,7 +1,14 @@
 apiVersion: v2
 name: operator-wandb
 description: A Helm chart for deploying W&B to Kubernetes
+<<<<<<< HEAD
 type: application
+=======
+<<<<<<< HEAD
+=======
+type: application
+>>>>>>> e2cb8ca (fix)
+>>>>>>> c9d3093 (fix)
 version: 0.22.0
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg