diff --git a/runtime/lua/xml.lua b/runtime/lua/xml.lua
index 6a4c0b2ea5..85484ea8ab 100644
--- a/runtime/lua/xml.lua
+++ b/runtime/lua/xml.lua
@@ -106,6 +106,16 @@ function xml.LoadXMLFile(fileName)
 	elseif fileText == "" then
 		return nil, fileName.." file is empty"
 	end
+<<<<<<<
+=======
+	local fileText = fileHnd:read("*a")
+	fileHnd:close()
+	if not fileText then
+		return nil, fileName.." file returns nil.  OneDrive?"
+	elseif fileText == "" then
+		return nil, fileName.." file is empty"
+	end
+>>>>>>>
 	return xml.ParseXML(fileText)
 end
 
diff --git a/src/Modules/Main.lua b/src/Modules/Main.lua
index c26c996373..f35da6703f 100644
--- a/src/Modules/Main.lua
+++ b/src/Modules/Main.lua
@@ -513,6 +513,17 @@ end
 
 function main:LoadSettings(ignoreBuild)
 	local setXML, errMsg = common.xml.LoadXMLFile(self.userPath.."Settings.xml")
+<<<<<<<
+=======
+	if errMsg and not errMsg:match(".*No such file or directory") then
+		ConPrintf("Error: '%s'", errMsg)
+		launch:ShowErrMsg("^1"..errMsg)
+		return true
+	end
+	if not setXML then
+		return true
+	elseif setXML[1].elem ~= "PathOfBuilding2" then
+>>>>>>>
 	if errMsg and not errMsg:match(".*No such file or directory") then
 		ConPrintf("Error: '%s'", errMsg)
 		launch:ShowErrMsg("^1"..errMsg)
@@ -653,6 +664,12 @@ function main:LoadSharedItems()
 	if errMsg and not errMsg:match(".*No such file or directory") then
 		ConPrintf("Error: '%s'", errMsg)
 		launch:ShowErrMsg("^1"..errMsg)
+<<<<<<<
+=======
+		return true
+	end
+	if not setXML then
+>>>>>>>
 		return true
 	end
 	if not setXML then