diff --git a/utils/allowlist.py b/utils/allowlist.py
index 80427ef..97467e3 100644
--- a/utils/allowlist.py
+++ b/utils/allowlist.py
@@ -18,9 +18,14 @@ import json
 import os
 import time
 <<<<<<< HEAD
+<<<<<<< HEAD
 import utils.colortext as ct
 =======
 >>>>>>> ccbf716 (Zar-Branch (#6))
+=======
+import utils.colortext as ct
+
+>>>>>>> b187d8c (Added colors)
 
 def pullPolicyExechistories(url, choice, policiesnames, outputjson: bool):