Fixed conflicts

Author: pazone

.buildkite/pull-requests.json

@@ -13,9 +13,6 @@
             "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
             "skip_ci_labels": [ "skip-ci" ],
             "skip_target_branches": [ ],
-<<<<<<< HEAD
-            "skip_ci_on_only_changed": [ ],
-=======
             "skip_ci_on_only_changed": [ "^.ci/", "^.github/", "^changelog", "^docs/", "\\.md$", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
             "always_require_ci_on_changed": [ ]
         },
@@ -34,7 +31,6 @@
             "skip_ci_labels": [ "skip-ci", "skip-it" ],
             "skip_target_branches": [ ],
             "skip_ci_on_only_changed": [ "^.ci/", "^.github/", "^changelog", "^docs/", "\\.md$", "^sonar-project.properties", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
->>>>>>> 0b99ccb922 ([CI] Trigger improvements (#4836))
             "always_require_ci_on_changed": [ ]
         },
         {