fix conflicts

Author: dimitre

libs/openFrameworks/video/ofVideoBaseTypes.h

@@ -230,17 +230,11 @@ 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()