diff --git a/.gitignore b/.gitignore
index f039455..cf16774 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ crawler/**
 scripts/__pycache__/**
 .env
 env/
+submissions
diff --git a/scripts/lantern.py b/scripts/lantern.py
index db03c56..dd37a4c 100644
--- a/scripts/lantern.py
+++ b/scripts/lantern.py
@@ -1199,6 +1199,11 @@ Maintenance:
                 break
             
             case 11:
+<<<<<<< HEAD
+=======
+                category = "ExternalUser"
+                sensitive = "YES"
+>>>>>>> 4e79b26ebf206e4c31d91a764ede8e3722c8c4aa
                 try:       
                     print_colors("1) Move entries to verified 2) Move entries from submission to unverified  3) Delete from submission file 0) exit")
                     option = int(input("Enter an option: "))
@@ -1215,8 +1220,11 @@ Maintenance:
                             link = submission_df.iloc[indx]['link'].strip()
                             name = submission_df.iloc[indx]['name'].strip()
                             desc = submission_df.iloc[indx]['desc'].strip()
+<<<<<<< HEAD
                             category = submission_df.iloc[indx]['category'].strip()
                             sensitive = "YES" if submission_df.iloc[indx]['sensitive'].strip() == 'y' else "NO"
+=======
+>>>>>>> 4e79b26ebf206e4c31d91a764ede8e3722c8c4aa
 
                                 
                             new_row = pd.DataFrame({'Instance': [instance], 'Category': [category], 'Name':[name],'URL':[link],'Sensitive':[sensitive],'Description':[desc],'Status':['YES'],'Score':['100']})
diff --git a/submissions/submission.csv b/submissions/submission.csv
index 95fdc2d..dde578d 100644
--- a/submissions/submission.csv
+++ b/submissions/submission.csv
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 link,name,desc,category,sensitive
 ,,
 http://git.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion,"Nihilist Git repo","GIt repo","Git Repo",n
+=======
+link,name,desc
+f45bzecjvj6aviwkczxpr3vukapibx275hlqetrl6fo6youlsbbz2myd.onion,MyInstance,"Lantern Instance"
+>>>>>>> 4e79b26ebf206e4c31d91a764ede8e3722c8c4aa