Why does the cvs download (at bitbake enigma2) of po files have the lines like >>>> ,<<<<< and ===== ? These lines cause error in 'install'. The cvs directory po files do not have these lines and install ok. Any explanation please ? :-

"Project-Id-Version: tuxbox-enigma 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< ar.po
<<<<<<< ar.po
<<<<<<< ar.po
"POT-Creation-Date: 2008-03-11 20:46+0000\n"
=======
"POT-Creation-Date: 2008-02-20 00:33+0100\n"
>>>>>>> 1.43
=======
"POT-Creation-Date: 2007-07-30 00:02+0200\n"
>>>>>>> 1.39
=======
"POT-Creation-Date: 2008-02-20 00:33+0100\n"
>>>>>>> 1.43
"PO-Revision-Date: 2006-01-10 01:17+0300\n"
"Last-Translator: hazem <moustafagamal@hotmail.com>\n"
"Language-Team: Arabic <moustafagamal@hotmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: Arabic\n"
"X-Poedit-Country: EGYPT\n"
"X-Poedit-SourceCharset: iso-8859-15\n"[CODE]