diff --git a/Foundation/src/Path_WIN32U.cpp b/Foundation/src/Path_WIN32U.cpp
index b4db58bb3..ebd69d468 100644
--- a/Foundation/src/Path_WIN32U.cpp
+++ b/Foundation/src/Path_WIN32U.cpp
@@ -132,14 +132,12 @@ std::string PathImpl::cacheHomeImpl()
 }
 
 
-<<<<<<< HEAD
-=======
 std::string PathImpl::tempHomeImpl()
 {
 	return tempImpl();
 }
 
->>>>>>> 06e59cb... add Windows compliant implementation of XDG Base Directory Specification
+
 std::string PathImpl::tempImpl()
 {
 	Buffer<wchar_t> buffer(MAX_PATH_LEN);