diff --git a/revid/RevidInstance.go b/revid/RevidInstance.go
index f7749b7d..b7e48c0c 100644
--- a/revid/RevidInstance.go
+++ b/revid/RevidInstance.go
@@ -495,7 +495,7 @@ func (r *revidInst) setupInputForFile() error {
 
 func (r *revidInst)testRtmp(delayTime uint){
 	for {
-		time.Sleep(time.Duration(delayTime)*time.Millisecond)
+		time.Sleep(time.Duration(delayTime)*time.Millisecond) 
 		r.rtmpInst.EndSession()
 		r.rtmpInst.StartSession()
 	}
diff --git a/revid/revid_test.go b/revid/revid_test.go
index 9ed7235a..f6cf43d3 100644
--- a/revid/revid_test.go
+++ b/revid/revid_test.go
@@ -145,12 +145,6 @@ func TestFlvOutputFile(t *testing.T) {
 }
 */
 
-<<<<<<< Updated upstream
-
-
-
-=======
->>>>>>> Stashed changes
 // Test h264 inputfile to flv format into rtmp using librtmp c wrapper
 func TestRtmpOutputUsingLibRtmp(t *testing.T){
 	config := Config{