diff --git a/logawl/logawl.go b/logawl/logawl.go
index 72ed4132..02bdce8c 100644
--- a/logawl/logawl.go
+++ b/logawl/logawl.go
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 // SPDX-License-Identifier: BSD-3-Clause
 
->>>>>>> upstream/master
 package logawl
 
 import (
diff --git a/logawl/logger.go b/logawl/logger.go
index ceca3ec0..44ec205d 100644
--- a/logawl/logger.go
+++ b/logawl/logger.go
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 // SPDX-License-Identifier: BSD-3-Clause
 
->>>>>>> upstream/master
 package logawl
 
 import (