diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index c129fe8..bdb626e 100644
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1607,13 +1607,8 @@ int XMLDocument::SaveFile( const char* filename, bool compact )
 	#endif
 		SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, filename, 0 );
 		return errorID;
-<<<<<<< HEAD
 	}
 	SaveFile(fp, compact);
-=======
-		}
-	SaveFile(fp);
->>>>>>> martell/master
 	fclose( fp );
 	return errorID;
 }