diff --git a/doc/changes/changes_2.8.2.md b/doc/changes/changes_2.8.2.md
index e8f950e4..2c2da895 100644
--- a/doc/changes/changes_2.8.2.md
+++ b/doc/changes/changes_2.8.2.md
@@ -16,15 +16,6 @@ This release upgrades to [virtual-schema-common-document-files 7.3.6](https://gi
 
 #### Compile Dependency Updates
 
-<<<<<<< HEAD
-* Updated `software.amazon.awssdk:s3:2.20.156` to `2.21.4`
-
-#### Test Dependency Updates
-
-* Updated `com.amazonaws:aws-java-sdk-s3:1.12.559` to `1.12.570`
-* Updated `com.exasol:extension-manager-integration-test-java:0.5.1` to `0.5.4`
-* Updated `com.fasterxml.jackson.core:jackson-databind:2.15.2` to `2.15.3`
-=======
 * Updated `com.exasol:virtual-schema-common-document-files:7.3.4` to `7.3.6`
 * Updated `software.amazon.awssdk:s3:2.20.156` to `2.21.6`
 
@@ -35,28 +26,10 @@ This release upgrades to [virtual-schema-common-document-files 7.3.6](https://gi
 * Updated `com.exasol:virtual-schema-common-document-files:7.3.4` to `7.3.6`
 * Updated `com.fasterxml.jackson.core:jackson-databind:2.15.2` to `2.15.3`
 * Updated `org.jacoco:org.jacoco.agent:0.8.10` to `0.8.11`
->>>>>>> origin/main
 * Updated `org.mockito:mockito-core:5.5.0` to `5.6.0`
 * Updated `org.testcontainers:junit-jupiter:1.19.0` to `1.19.1`
 * Updated `org.testcontainers:localstack:1.19.0` to `1.19.1`
 
-<<<<<<< HEAD
-### Extension
-
-#### Compile Dependency Updates
-
-* Updated `@exasol/extension-manager-interface:0.3.0` to `0.3.1`
-
-#### Development Dependency Updates
-
-* Updated `eslint:^8.46.0` to `^8.51.0`
-* Updated `@typescript-eslint/parser:^6.3.0` to `^6.8.0`
-* Updated `@types/jest:^29.5.3` to `^29.5.6`
-* Updated `typescript:^5.1.6` to `^5.2.2`
-* Updated `@typescript-eslint/eslint-plugin:^6.3.0` to `^6.8.0`
-* Updated `jest:29.6.2` to `29.7.0`
-* Updated `esbuild:^0.19.0` to `^0.19.5`
-=======
 #### Plugin Dependency Updates
 
 * Updated `com.exasol:error-code-crawler-maven-plugin:1.3.0` to `1.3.1`
@@ -65,4 +38,3 @@ This release upgrades to [virtual-schema-common-document-files 7.3.6](https://gi
 * Updated `org.codehaus.mojo:versions-maven-plugin:2.16.0` to `2.16.1`
 * Updated `org.jacoco:jacoco-maven-plugin:0.8.10` to `0.8.11`
 * Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184` to `3.10.0.2594`
->>>>>>> origin/main