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