diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json
index 91e8eff89fd..e87f1787752 100644
--- a/erpnext/setup/setup_wizard/data/country_wise_tax.json
+++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json
@@ -2121,10 +2121,13 @@
 		"KSA VAT 15%": {
 			"account_name": "VAT 15%",
 			"tax_rate": 15.00
+<<<<<<< HEAD
 		},
 		"KSA VAT 5%": {
 			"account_name": "VAT 5%",
 			"tax_rate": 5.00
+=======
+>>>>>>> abded895f3 (fix: update default KSA VAT rate for setup (#27614))
 		},
 		"KSA VAT Zero": {
 			"account_name": "VAT Zero",