diff --git a/plugins/gossip/transaction_processor_test.go b/plugins/gossip/transaction_processor_test.go
index 86b6349a9f3b32d7b3c10d07331647929500d2bb..c07602df5f71f7b93168bdd8f01271a994a50697 100644
--- a/plugins/gossip/transaction_processor_test.go
+++ b/plugins/gossip/transaction_processor_test.go
@@ -9,11 +9,7 @@ import (
 )
 
 func BenchmarkProcessSimilarTransactionsFiltered(b *testing.B) {
-<<<<<<< HEAD
-	byteArray := setupTransaction(transaction.MARSHALED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
-=======
 	byteArray := setupTransaction(meta_transaction.MARSHALLED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
->>>>>>> master
 
 	b.ResetTimer()
 
@@ -23,11 +19,7 @@ func BenchmarkProcessSimilarTransactionsFiltered(b *testing.B) {
 }
 
 func BenchmarkProcessSimilarTransactionsUnfiltered(b *testing.B) {
-<<<<<<< HEAD
-	byteArray := setupTransaction(transaction.MARSHALED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
-=======
 	byteArray := setupTransaction(meta_transaction.MARSHALLED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
->>>>>>> master
 
 	b.ResetTimer()