1 files changed, 1 insertions, 18 deletions
diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index 637aeb10..f0f3ce89 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -1687,26 +1687,12 @@ namespace BinaryNinja {
 	struct UndoEntry
 	{
 		Ref<User> user;
-		std::string hash;
+		std::string id;
 		std::vector<UndoAction> actions;
 		uint64_t timestamp;
 	};
 
 	/*!
-
-		\ingroup coreapi
-	*/
-	struct MergeResult
-	{
-		BNMergeStatus status;
-		UndoAction action;
-		std::string hash;
-
-		MergeResult() : status(NOT_APPLICABLE) {}
-		MergeResult(const BNMergeResult& result);
-	};
-
-	/*!
 		\ingroup filemetadata
 	*/
 	class SaveSettings : public CoreRefCountObject<BNSaveSettings, BNNewSaveSettingsReference, BNFreeSaveSettings>
@@ -1877,9 +1863,6 @@ namespace BinaryNinja {
 		bool CreateSnapshotedView(BinaryView* data, const std::string& viewName,
 								  const std::function<bool(size_t progress, size_t total)>& progressCallback);
 
-		MergeResult MergeUserAnalysis(const std::string& name, const std::function<bool(size_t, size_t)>& progress,
-		    const std::vector<std::string> excludedHashes = {});
-
 		/*! Start recording actions taken so they can be undone at some point
 		*/
 		void BeginUndoActions();