diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60d9701b..3990b2a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -119,7 +119,6 @@
 - SSH2: error out when no data is received from the server (#1647)
 - SFTP: don't attempt to parse unsupported attributes (#1708)
 - SFTP: getSupportedVersions() call didn't work
->>>>>>> 2.0
 
 ## 2.0.34 - 2021-10-26