diff --git a/library/io.po b/library/io.po
index 0100bc9b..60607599 100644
--- a/library/io.po
+++ b/library/io.po
@@ -6,11 +6,8 @@ msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-23 14:38+0200\n"
-<<<<<<< HEAD
 "PO-Revision-Date: 2023-11-14 23:18+0100\n"
-=======
 "PO-Revision-Date: 2023-11-14 22:46+0100\n"
->>>>>>> 66309f9360bc4f58f5002fc2a779bf0b7576180b
 "Last-Translator: Houedji Espoir <therencecossi@gmail.com>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
 "Language: fr\n"
@@ -122,7 +119,6 @@ msgstr ""
 msgid ""
 "In-memory binary streams are also available as :class:`BytesIO` objects::"
 msgstr ""
-<<<<<<< HEAD
 
 #: library/io.rst:89
 msgid ""