diff --git a/layouts/ara b/layouts/ara
index cbb72ae..58f4419 100644
--- a/layouts/ara
+++ b/layouts/ara
@@ -113,11 +113,7 @@ z = ~
 7 = ٧
 8 = ٨
 9 = ٩
-<<<<<<< HEAD
-0 = ̥
-=======
 0 = ٠
->>>>>>> 8679f77 (Add eastern arabic 0)
 ; = گ
 = = ≠
 [ = چ