resolve merge conflicts

Jenkinsfile

@@ -282,7 +282,7 @@ Void setNewTestVersion() {
 
 Void setNewGitopsVersion(String environment) {
     dir("gitops") {
-        def envFile = "${environment}/application/values/antragsraum-client-values.yaml"
+        def envFile = "${environment}/application/values/antragraum-client-values.yaml"
 
         def envVersions = readYaml file: envFile
 
@@ -293,7 +293,7 @@ Void setNewGitopsVersion(String environment) {
 
         if (hasValuesFileChanged(environment)) {
             sh "git add ${envFile}"
-            sh "git commit -m 'jenkins rollout ${environment} antragsraum-client version ${IMAGE_TAG}'"
+            sh "git commit -m 'jenkins rollout ${environment} antragraum-client version ${IMAGE_TAG}'"
         }
     }
 }
@@ -306,7 +306,7 @@ String getPackagejsonVersion() {
 }
 
 Boolean hasValuesFileChanged(String environment) {
-    return sh (script: "git status | grep '${environment}/application/values/antragsraum-client-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+    return sh (script: "git status | grep '${environment}/application/values/antragraum-client-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
 Boolean isReleaseBranch() {