diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 144739cd..543dd0b3 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,7 @@
 {
+<<<<<<< HEAD
   ".": "3.2.2"
+=======
+  ".": "3.2.0"
+>>>>>>> 35c54be (chore(master): release 3.2.0 (#165))
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a78587db..32a98feb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+<<<<<<< HEAD
 ## [3.2.2](https://github.com/Loop3D/map2loop/compare/v3.2.1...v3.2.2) (2025-01-13)
 
 
@@ -14,6 +15,8 @@
 
 * include dependencies in site-packages  - issue [#169](https://github.com/Loop3D/map2loop/issues/169) ([#170](https://github.com/Loop3D/map2loop/issues/170)) ([b33532b](https://github.com/Loop3D/map2loop/commit/b33532b56473148433fd192e182aadee028dc875))
 
+=======
+>>>>>>> 35c54be (chore(master): release 3.2.0 (#165))
 ## [3.2.0](https://github.com/Loop3D/map2loop/compare/v3.1.13...v3.2.0) (2024-12-16)
 
 
diff --git a/map2loop/version.py b/map2loop/version.py
index 1e3bed4c..c9026efd 100644
--- a/map2loop/version.py
+++ b/map2loop/version.py
@@ -1 +1,5 @@
+<<<<<<< HEAD
 __version__ = "3.2.2"
+=======
+__version__ = "3.2.0"
+>>>>>>> 35c54be (chore(master): release 3.2.0 (#165))