diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 84ed9d1402..e72e11a761 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -7,8 +7,12 @@ __version__ = "14.0.0-dev"
 =======
 from erpnext.hooks import regional_overrides
 
+<<<<<<< HEAD
 __version__ = "13.27.1"
 >>>>>>> 096dcf0e54 (chore(release): Bumped to Version 13.27.1)
+=======
+__version__ = "13.28.0"
+>>>>>>> 8cc2ea0ddb (chore(release): Bumped to Version 13.28.0)
 
 
 def get_default_company(user=None):