diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
index 7d42b7d..33457da 100644
--- a/docs/docs/changelog.md
+++ b/docs/docs/changelog.md
@@ -8,7 +8,6 @@ sidebar_position: 2
 
 ### Breaking Changes
 
-<<<<<<< Updated upstream
 The `Salable` class has been replaced with a new `initSalable` function. Using the new initialise function will enable 
 vendors to use `v2` or `v3` of the API within the same version of the SDK.