diff --git a/config/cruisecontrol/version-2.6.1/config.xml b/config/cruisecontrol/version-2.6.1/config.xml
index 347655d024423e0f39749d6f8bef4bf889699726..0a3dbac284a39c66c72b1b880abb09cdabc65ee5 100644
--- a/config/cruisecontrol/version-2.6.1/config.xml
+++ b/config/cruisecontrol/version-2.6.1/config.xml
@@ -57,8 +57,7 @@
     </schedule>
     <log>
       <merge dir="${lims.nightly-build.dir}/targets/test-output"/>
-      <merge dir="${lims.nightly-build.dir}/targets/playground/openBIS-client/test-report-strict.xml"/>
-      <merge dir="${lims.nightly-build.dir}/targets/playground/openBIS-client/test-report-plates-on-demand.xml"/>
+      <merge dir="${lims.nightly-build.dir}/targets/playground/openBIS-client" pattern="test-report*.xml"/>
     </log>
     <publishers>
       <onsuccess>
@@ -75,8 +74,13 @@
           <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>