diff --git a/tex/polyglossia.sty b/tex/polyglossia.sty
index 2eae1eeb..5877d002 100644
--- a/tex/polyglossia.sty
+++ b/tex/polyglossia.sty
@@ -1043,7 +1043,6 @@
   \tl_gset:Nn \xpg_main_language_tl {#2}
   %% The following settings are for the default language and script
   % this tells bidi.sty or luabidi.sty that the document is RTL
-<<<<<<< HEAD
   \str_if_eq:eeT { \prop_item:Nn \l_xpg_langsetup_prop { #2 / direction } } { RL }
     {
       \__xpg_setRTLmain: