@@ -735,11 +735,7 @@ COleDateTime& operator=(const UDATE& udate) throw();
 
 - **operator =(** *systimeSrc* **)** The [SYSTEMTIME](http://msdn.microsoft.com/library/windows/desktop/ms724950) value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; if unsuccessful, it is set to invalid.  
 
-<<<<<<< HEAD
-- **operator =(** `udate` **)** The **UDATE** value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; if unsuccessful, it is set to invalid. A **UDATE** structure represents an "unpacked" date. See the function [VarDateFromUdate](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-vardatefromudate) for more details.  
-=======
-- **operator =(** `udate` **)** The `UDATE` value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; if unsuccessful, it is set to invalid. A `UDATE` structure represents an "unpacked" date. See the function [VarDateFromUdate](http://msdn.microsoft.com/en-us/1c924ac5-b896-49e1-9ccf-825ac7a030c8) for more details.  
->>>>>>> master
+- **operator =(** `udate` **)** The `UDATE` value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; if unsuccessful, it is set to invalid. A `UDATE` structure represents an "unpacked" date. See the function [VarDateFromUdate](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-vardatefromudate) for more details.  
 
 - **operator =(** `filetimeSrc` **)** The [FILETIME](http://msdn.microsoft.com/library/windows/desktop/ms724284) value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; otherwise it is set to invalid. `FILETIME` uses Universal Coordinated Time (UTC), so if you pass a UTC time in the structure, your results will be converted from UTC time to local time, and will be stored as variant time. This behavior is the same as in Visual C++ 6.0 and Visual C++.NET 2003 SP2. See [File Times](http://msdn.microsoft.com/library/windows/desktop/ms724290) in the Windows SDK for more information.  
 
 
@@ -77,13 +77,8 @@ HRESULT Attach(VARIANT* pSrc);
 ```  
 
 ### Parameters  
-<<<<<<< HEAD
- `pSrc`  
- [in] Points to the [VARIANT](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagvariant) to be attached to the object.  
-=======
  *pSrc*  
- [in] Points to the [VARIANT](http://msdn.microsoft.com/en-us/e305240e-9e11-4006-98cc-26f4932d2118) to be attached to the object.  
->>>>>>> master
+ [in] Points to the [VARIANT](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagvariant) to be attached to the object.  
 
 ### Return Value  
  A standard HRESULT value.  
 
@@ -21,28 +21,3 @@ This section describes Microsoft-specific extensions to C++ in the following are
 
 -   The [__w64](../cpp/w64.md) keyword  
 
----
-title: "Microsoft-Specific Modifiers | Microsoft Docs"
-ms.custom: ""
-ms.date: "11/04/2016"
-ms.technology: ["cpp-language"]
-ms.topic: "language-reference"
-dev_langs: ["C++"]
-ms.assetid: 22c7178c-f854-47fa-9de6-07d23fda58e1
-author: "mikeblome"
-ms.author: "mblome"
-ms.workload: ["cplusplus"]
----
-# Microsoft-Specific Modifiers
-This section describes Microsoft-specific extensions to C++ in the following areas:  
-  
--   [Based addressing](../cpp/based-addressing.md), the practice of using a pointer as a base from which other pointers can be offset  
-  
--   [Function calling conventions](../cpp/calling-conventions.md)  
-  
--   Extended storage-class attributes declared with the [__declspec](../cpp/declspec.md) keyword  
-  
--   The [__w64](../cpp/w64.md) keyword  
-  
-### Microsoft-Specific Keywords  
-