diff --git a/CHANGELOG.md b/CHANGELOG.md
index e55e976..ed6dc01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,16 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
-<<<<<<< Updated upstream
 ## [2.3.0](https://github.com/apify/apify-shared-python/releases/tag/v2.3.0) (2026-08-03)
 
 ### 🚀 Features
 
 - Deprecate the apify-shared package ([#79](https://github.com/apify/apify-shared-python/pull/79)) ([b1de9ba](https://github.com/apify/apify-shared-python/commit/b1de9ba7c305d59e987f2b07d58007160a7b7866)) by [@vdusek](https://github.com/vdusek)
-=======
-<!-- git-cliff-unreleased-start -->
-## 2.3.1 - **not yet released**
->>>>>>> Stashed changes
 
 
 ## [2.2.1](https://github.com/apify/apify-shared-python/releases/tag/v2.2.1) (2026-07-08)
diff --git a/pyproject.toml b/pyproject.toml
index 5341618..2a5f974 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,11 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "apify_shared"
-<<<<<<< Updated upstream
 version = "2.3.0"
-=======
-version = "2.3.1"
->>>>>>> Stashed changes
 description = "DEPRECATED - Tools and constants shared across Apify projects."
 authors = [{ name = "Apify Technologies s.r.o.", email = "support@apify.com" }]
 license = "Apache-2.0"
diff --git a/uv.lock b/uv.lock
index a49e227..e786fb4 100644
--- a/uv.lock
+++ b/uv.lock
@@ -13,11 +13,7 @@ apify-fingerprint-datapoints = false
 
 [[package]]
 name = "apify-shared"
-<<<<<<< Updated upstream
 version = "2.3.0"
-=======
-version = "2.3.1"
->>>>>>> Stashed changes
 source = { editable = "." }
 
 [package.dev-dependencies]