diff --git a/lib/private/Diagnostics/QueryLogger.php b/lib/private/Diagnostics/QueryLogger.php
index 54ce3542f4..875d25e9be 100644
--- a/lib/private/Diagnostics/QueryLogger.php
+++ b/lib/private/Diagnostics/QueryLogger.php
@@ -3,13 +3,9 @@
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
  * @author Morris Jobke <hey@morrisjobke.de>
-<<<<<<< HEAD
  * @author Robin Appelman <robin@icewind.nl>
-=======
- * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Piotr Mrowczynski <piotr@owncloud.com>
->>>>>>> a5095447b7... Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643)
  *
  * @license AGPL-3.0
  *
diff --git a/lib/public/Diagnostics/IEventLogger.php b/lib/public/Diagnostics/IEventLogger.php
index 4c2ae9e3b2..c76e96c567 100644
--- a/lib/public/Diagnostics/IEventLogger.php
+++ b/lib/public/Diagnostics/IEventLogger.php
@@ -3,12 +3,8 @@
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
  * @author Morris Jobke <hey@morrisjobke.de>
-<<<<<<< HEAD
  * @author Robin Appelman <robin@icewind.nl>
-=======
- * @author Robin Appelman <icewind@owncloud.com>
  * @author Piotr Mrowczynski <piotr@owncloud.com>
->>>>>>> a5095447b7... Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643)
  *
  * @license AGPL-3.0
  *
diff --git a/lib/public/Diagnostics/IQueryLogger.php b/lib/public/Diagnostics/IQueryLogger.php
index 3ab491a275..32723a56cb 100644
--- a/lib/public/Diagnostics/IQueryLogger.php
+++ b/lib/public/Diagnostics/IQueryLogger.php
@@ -3,12 +3,8 @@
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
  * @author Morris Jobke <hey@morrisjobke.de>
-<<<<<<< HEAD
  * @author Robin Appelman <robin@icewind.nl>
-=======
- * @author Robin Appelman <icewind@owncloud.com>
  * @author Piotr Mrowczynski <piotr@owncloud.com>
->>>>>>> a5095447b7... Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643)
  *
  * @license AGPL-3.0
  *