diff --git a/CHANGES.md b/CHANGES.md
index 74ad83b0f0..f44897f38f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -36,7 +36,6 @@
 - Platform name max length is now 128 chars and not 256 for better API consistency
 - Webhooks payloads are now exactly the same as any of the API response objects
 - Added new locale: Marathi -mr (@spielers)
->>>>>>> b12097efecffcefe89cbc411148acb45fbdfc374
 - New and consistent response format for all API object + new response examples in the docs
   - Removed user roles attribute from user object (can be fetched from /v1/teams/memberships) **
   - Removed type attribute from session object response (used only internally)