Resolve conflict

charts/user-monitoring/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/user-monitoring/templates/user-prometheus.yaml

@@ -20,10 +20,6 @@ spec:
   resources:
     requests:
       memory: 400Mi
-<<<<<<< HEAD
-  enableAdminAPI: false
-=======
   enableAdminAPI: true
   externalLabels:
     monitoring: {{ .Values.user }}
->>>>>>> 2acef0e (Update prometheus config)