diff --git a/src/eventSyncer.js b/src/eventSyncer.js
index b398edb..4c115c3 100644
--- a/src/eventSyncer.js
+++ b/src/eventSyncer.js
@@ -1,10 +1,7 @@
 const { fromEvent, interval, ReplaySubject } = require('rxjs');
 const { throttle, distinctUntilChanged } = require('rxjs/operators');
 const { randomString } = require('./utils.js');
-<<<<<<< HEAD
 
-=======
->>>>>>> refactor eventSyner
 const Database = require('./database.js');
 const Events = require('events');
 const Web3 = require('web3');