chore: fix merge

chart/Chart.yaml

 apiVersion: v2
 name: bigbang
-version: 1.0.3
-<<<<<<< HEAD
+version: 1.0.5
 
-=======
->>>>>>> origin/master

chart/templates/gitlab-runner/namespace.yaml

@@ -4,7 +4,7 @@ kind: Namespace
 metadata:
   name: gitlab-runner
 
-{{- if and (ne .Values.registryCredentials.username "") (ne .Values.registryCredentials.password "") }}
+{{- if ( include "imagePullSecret" . ) }}
 ---
 apiVersion: v1
 kind: Secret

chart/values.yaml

@@ -167,10 +167,9 @@ addons:
     git:
       repo: https://repo1.dsop.io/platform-one/big-bang/apps/sandbox/authservice.git
       path: "./chart"
-<<<<<<< HEAD
-      tag: "0.1.4-bb.0"
+      tag: "0.1.6-bb.0"
     values: {}
-  
+ 
   gitlabRunner:
     enabled: false
     git:
@@ -178,9 +177,6 @@ addons:
       path: "./chart"
       tag: "0.19.2-bb.1"
     values: {}
-=======
-      tag: "0.1.6-bb.0"
-    values: {}
 
   gitlab:
     enabled: false
@@ -188,4 +184,3 @@ addons:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab.git
       path: "./chart"
       tag: "4.2.0-bb.1"
->>>>>>> origin/master