diff --git a/NyaaPy/nyaa.py b/NyaaPy/nyaa.py
index 8bd9614..e4ca1bb 100644
--- a/NyaaPy/nyaa.py
+++ b/NyaaPy/nyaa.py
@@ -5,7 +5,11 @@ from NyaaPy import utils
 class Nyaa:
 
     def __init__(self):
+<<<<<<< HEAD
         self.SITE = utils.TorrentSite.NYAASI
+=======
+        self.URI = "https://nyaa.si"
+>>>>>>> 5c93e516ba364d448335ebdc6989f8e1724c88c7
 
     def last_uploads(self, number_of_results):
         r = requests.get(self.SITE.value)
diff --git a/tests/test_sukebei.py b/tests/test_sukebei.py
index eebaaf6..e961c17 100644
--- a/tests/test_sukebei.py
+++ b/tests/test_sukebei.py
@@ -1,6 +1,13 @@
 from NyaaPy import SukebeiNyaa
+<<<<<<< HEAD
 from datetime import datetime
 import json
+=======
+from pprint import pprint
+from datetime import datetime
+import json
+import sys
+>>>>>>> 5c93e516ba364d448335ebdc6989f8e1724c88c7
 import os
 
 # Creating a folder for test_files