diff --git a/config/cruisecontrol/version-2.6.1/config.xml b/config/cruisecontrol/version-2.6.1/config.xml
index 0a3dbac284a39c66c72b1b880abb09cdabc65ee5..de396a2ab57c9018f762cab1ba81754cd3360be0 100644
--- a/config/cruisecontrol/version-2.6.1/config.xml
+++ b/config/cruisecontrol/version-2.6.1/config.xml
@@ -74,13 +74,8 @@
           <map alias="hadrian" address="adrian.honeggar@systemsx.ch"/>
           <map alias="ribeaudc" address="christian.ribeaud@systemsx.ch "/>
           <map alias="tpylak" address="tomasz.pylak@systemsx.ch"/>
-<<<<<<< .mine
 	  <map alias="bneff" address="basil.neff@systemsx.ch" />
 	  <map alias="izabel" address="izabela.adamczyk@systemsx.ch" />
-=======
-          <map alias="bneff" address="basil.neff@systemsx.ch" />
-          <map alias="izabel" address="izabela.adamczyk@systemsx.ch" />
->>>>>>> .r5352
         </htmlemail>
       </onfailure>
     </publishers>
@@ -180,6 +175,16 @@
     </modificationset>
   </project>
   
+  <project name="dataset_download">
+    <modificationset quietperiod="${quiet-period}">
+      <buildstatus logdir="logs/build_resources"/>
+      <buildstatus logdir="logs/libraries"/>
+      <buildstatus logdir="logs/common"/>
+      <buildstatus logdir="logs/lims_base"/>
+      <svn localWorkingCopy="${project.trunk}"/>
+    </modificationset>
+  </project>
+  
   <project name="lims">
     <modificationset quietperiod="${quiet-period}">
       <buildstatus logdir="logs/build_resources"/>