diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 85db714eaa..36fbdb6718 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -7,6 +7,7 @@ __version__ = "14.0.0-dev"
 =======
 from erpnext.hooks import regional_overrides
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 __version__ = "13.27.1"
@@ -17,6 +18,9 @@ __version__ = "13.28.0"
 =======
 __version__ = "13.29.0"
 >>>>>>> 7369db59aa (chore(release): Bumped to Version 13.29.0)
+=======
+__version__ = "13.27.0"
+>>>>>>> 5b02b5b3cd (chore: Remove unintended changes)
 
 
 def get_default_company(user=None):