diff --git a/logging/src/charts/helm.yaml b/logging/charts/helm.yaml
similarity index 62%
rename from logging/src/charts/helm.yaml
rename to logging/charts/helm.yaml
index 80efbd5db8..f3e9d294ce 100644
--- a/logging/src/charts/helm.yaml
+++ b/logging/charts/helm.yaml
@@ -1,10 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
-  ref: 31.x-glow-preview
-=======
   ref: main
->>>>>>> upstream/main
   contextDir: logging
 deploy:
   replicas: 1
\ No newline at end of file