diff --git a/turbolist3r.py b/turbolist3r.py
index dd4da6d..739ea35 100644
--- a/turbolist3r.py
+++ b/turbolist3r.py
@@ -24,14 +24,7 @@ from collections import Counter
 try:
     from subbrute import subbrute
 except:
-<<<<<<< HEAD
     print("Failed to import subbrute, you will not be able to bruteforce")
-
-#import dns.resolver
-=======
-	print("Failed to import subbrute, you will not be able to bruteforce")
-import dns.resolver
->>>>>>> 84d82d9019bc65d836e14ce8d8959fd1deafd1de
 import requests
 
 # import dnslib, which provides better features compared to dns.resolver for finding subdomains