diff --git a/index.js b/index.js
index 587ef94d..8f1bffb9 100644
--- a/index.js
+++ b/index.js
@@ -8259,11 +8259,7 @@ let otherMap = {
     w: "ᴡ",
     x: "x",
     y: "ʏ",
-<<<<<<< HEAD
-    z: "ᴢ",
-=======
     z: "ᴢ"
->>>>>>> ac2e1ada835a5d7ae618d6180a03652a3ec20db2
 };
 
 let mathSansMap = {