diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
index bc9f138974e..662409c0ebc 100644
--- a/libs/openFrameworks/utils/ofConstants.h
+++ b/libs/openFrameworks/utils/ofConstants.h
@@ -2,7 +2,7 @@
 
 // version: ------------------------
 #define OF_VERSION_MAJOR 0
-#define OF_VERSION_MINOR 12
+#define OF_VERSION_MINOR 13
 #define OF_VERSION_PATCH 0
 #define OF_VERSION_PRE_RELEASE "master"
 
diff --git a/libs/openFrameworks/video/ofVideoBaseTypes.h b/libs/openFrameworks/video/ofVideoBaseTypes.h
index a3c573471bf..f9cc75064f8 100644
--- a/libs/openFrameworks/video/ofVideoBaseTypes.h
+++ b/libs/openFrameworks/video/ofVideoBaseTypes.h
@@ -214,6 +214,11 @@ class ofBaseVideoPlayer: virtual public ofBaseVideo{
 	/// \return True if the video was loaded successfully.
 	virtual bool load(std::string fileName);
 
+	virtual bool load(const of::filesystem::path & fileName) = 0;
+	virtual bool load(std::string name) {
+		return load(of::filesystem::path(name));
+	}
+
 	/// \brief Asynchronously load a video resource by name.
 	///
 	/// The list of supported video types and sources (e.g. rtsp:// sources) is
@@ -225,11 +230,17 @@ class ofBaseVideoPlayer: virtual public ofBaseVideo{
 	/// \param name The name of the video resource to load.
 	/// \sa isLoaded()
 	virtual void loadAsync(const of::filesystem::path & fileName);
+<<<<<<< HEAD
+	virtual bool loadAsync(std::string name) {
+		loadAsync(of::filesystem::path(name));
+	}
+=======
 	
 	/// \brief Legacy approach for Asynchronously load a video resource by name.
 	/// \param name The name of the video resource to load.
 	virtual void loadAsync(std::string fileName);
 
+>>>>>>> master
 	/// \brief Play the video from the current playhead position.
 	///
 	/// \sa getPosition()
diff --git a/libs/openFrameworks/video/ofVideoPlayer.h b/libs/openFrameworks/video/ofVideoPlayer.h
index 314ff5c2ac6..8e265fdd974 100644
--- a/libs/openFrameworks/video/ofVideoPlayer.h
+++ b/libs/openFrameworks/video/ofVideoPlayer.h
@@ -11,6 +11,7 @@ class ofVideoPlayer : public ofBaseVideoDraws {
 
 	bool load(const of::filesystem::path & fileName);
 	void loadAsync(const of::filesystem::path & fileName);
+
 	[[deprecated("Use load")]]
 	bool loadMovie(const of::filesystem::path & fileName);
 
diff --git a/scripts/apothecary b/scripts/apothecary
index 313b213ede6..b8b8325f8d0 160000
--- a/scripts/apothecary
+++ b/scripts/apothecary
@@ -1 +1 @@
-Subproject commit 313b213ede658eb6ae3fa5c4fb21a7bdcbe2230a
+Subproject commit b8b8325f8d060e5474248cb6c5c6bd24a6698307