diff --git a/revid/revid.go b/revid/revid.go
index c84d9d37..e5e0530c 100644
--- a/revid/revid.go
+++ b/revid/revid.go
@@ -56,7 +56,6 @@ const (
 	readTimeout           = 10 * time.Millisecond
 )
 
-<<<<<<< HEAD
 // RTMP connection properties.
 const (
 	rtmpConnectionMaxTries = 5
@@ -85,8 +84,6 @@ const (
 	Detail  = "Detail"
 )
 
-=======
->>>>>>> master
 type Logger interface {
 	SetLevel(int8)
 	Log(level int8, message string, params ...interface{})