From cbd1f42a085220b2b729d69a7f9f9212cda89e48 Mon Sep 17 00:00:00 2001
From: Alex <kinglykrab@gmail.com>
Date: Mon, 6 Apr 2020 18:57:13 -0400
Subject: [PATCH] Merge conflict fixes...

---
 zone/embparser_api.cpp | 2 +-
 zone/questmgr.cpp      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp
index e3e5a5664..c65cd204c 100644
--- a/zone/embparser_api.cpp
+++ b/zone/embparser_api.cpp
@@ -3358,7 +3358,7 @@ XS(XS__getcurrencyid) {
 	dXSTARG;
 
 	int 		RETVAL;
-	uint32      item_id = (int) SvUV(ST(0));;
+	uint32      item_id = (int) SvUV(ST(0));
 
 	RETVAL = quest_manager.getcurrencyid(item_id);
 	XSprePUSH;
diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp
index 52ef22621..ba6a5340c 100644
--- a/zone/questmgr.cpp
+++ b/zone/questmgr.cpp
@@ -2986,6 +2986,7 @@ int QuestManager::getcurrencyitemid(int currency_id) {
 			}
 			++iter;
 		}
+	}
 	return 0;
 }