Merge conflict fixes...

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;

zone/questmgr.cpp

@@ -2986,6 +2986,7 @@ int QuestManager::getcurrencyitemid(int currency_id) {
 			}
 			++iter;
 		}
+	}
 	return 0;
 }