Merge comments left in unified-nuxeo-ds.xml file for MySQL

In the Nuxeo EP 5.2 SNAPSHOT sources downloaded 2009-04-09 from SCM using mercurial, via:
hg clone http://hg.nuxeo.org/nuxeo/nuxeo-distribution#5.2

The file:
./nuxeo-distribution/nuxeo-platform-ear/src/main/resources_mysql/datasources/unified-nuxeo-ds.xml

has a couple of merge comments remaining in it (see below), which lead to a parse exceptiom at startup.

<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<<<<<<< local
<!-- UNIFIED DATASOURCE CONFIGURATION -->
<!--
This is the unified datasource configuration for MySQL. All datasources from
nuxeo points to this datasource so it will use only 1 database. If you wish
to use a different database for a service, comment out the link in the
relevant xxx-ds.xml file and add a datasource configuration.
-->
<!-- nuxeo datasource -->
=======
<!-- Configuration for MySQL -->
>>>>>>> other
<local-tx-datasource>
...