fix: resolve conflicts

Author: pkoutsovasilis

testing/integration/testdata/.upgrade-test-agent-versions.yml

@@ -5,14 +5,7 @@
 # upgrade integration tests.
 
 testVersions:
-<<<<<<< HEAD
-  - 8.18.3
-  - 8.17.8
-=======
-  - 9.1.0-SNAPSHOT
-  - 9.0.4-SNAPSHOT
-  - 9.0.3
   - 8.19.0-SNAPSHOT
   - 8.18.3
->>>>>>> e629b9ee5 (ci: always include 8.19 LTS release branch in snapshots of test versions (#8761))
+  - 8.17.8
   - 7.17.30-SNAPSHOT