diff --git a/hive/indexer/follow.py b/hive/indexer/follow.py
index 79b0ee876f8ca101c3290dd1b4256746144ede6d..dfbe742584a7961aae2750b4037a4d9dd5a84461 100644
--- a/hive/indexer/follow.py
+++ b/hive/indexer/follow.py
@@ -1,11 +1,6 @@
 """Handles follow operations."""
 
 import logging
-<<<<<<< HEAD
-=======
-from time import perf_counter as perf
-from json import dumps
->>>>>>> Cast all follow name data to string. Should protect against setting non string data types as names in follower and following
 
 from funcy.seqs import first
 from hive.db.adapter import Db