removed merge comments

Author: micheldumontier

versions/3.0.0.md

@@ -354,7 +354,6 @@ Field Name | Type | Description
 <a name="serverDescription"></a>description | `string` | An optional string describing the host designated by the URL. [CommonMark syntax](http://spec.commonmark.org/) MAY be used for rich text representation.
 <a name="serverVariables"></a>variables | Map[`string`, [Server Variable Object](#serverVariableObject)] | A map between a variable name and its value.  The value is used for substitution in the server's URL template.
 
-<<<<<<< HEAD:versions/3.0.md
 ##### smartAPi Fields
 
 Field Name | Type | Description
@@ -2273,7 +2272,6 @@ Field Name | Type | Description
 <a name="tagDescription"></a>description | `string` | A short description for the tag. [CommonMark syntax](http://spec.commonmark.org/) MAY be used for rich text representation.
 <a name="tagExternalDocs"></a>externalDocs | [External Documentation Object](#externalDocumentationObject) | Additional external documentation for this tag.
 
-<<<<<<< HEAD:versions/3.0.md
 ##### smartAPI Fields
 Field Name | Type | Description
 ---|:---:|---