diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 85db714..36fbdb6 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -9,6 +9,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 __version__ = "13.27.1"
 >>>>>>> 096dcf0e54 (chore(release): Bumped to Version 13.27.1)
 =======
@@ -17,6 +18,9 @@
 =======
 __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):