1 files changed, 4 insertions, 4 deletions
diff --git a/db/quest_db.conf b/db/quest_db.conf
index bd8683023..45bff12b6 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -162,10 +162,6 @@ quest_db: (
     Name: "Artis_Legion_Progress"
 },
 {
-    Id: 33
-    Name: "ArtisQuest_Apana"
-},
-{
     Id: 34
     Name: "CandorQuest_Chest"
 },
@@ -183,7 +179,11 @@ quest_db: (
 },
 {
     Id: 38
+<<<<<<< HEAD
     Name: "CandorQuest_Maya"
+=======
+    Name: "ArtisQuest_Apana"
+>>>>>>> 35753b2705a52c648a61a11d175dcc93a31bc3f5
 },
 {
 	Id: 1000