diff --git a/schema.md b/schema.md
index 19029590..eaef3cc7 100644
--- a/schema.md
+++ b/schema.md
@@ -76,36 +76,19 @@ Expanded Fields
 ---------------
 Agencies are encouraged to use the following expanded fields when appropriate. Agencies may freely augment these fields with their own.
 
-<<<<<<< HEAD
-{: .table .table-striped}
+{:.table .table-striped}
 Field               | Definition                                                                                                                                    | JSON
 ------              | ------                                                                                                                                        | ----
 Release Date        | Date of formal issuance.                                                                                                                      | issued
 Frequency           | Frequency with which dataset is published.                                                                                                    | accrualPeriodicity
 Language            | The language of the dataset.                                                                                                                  | language
-Granularity         | Level of granularity of the dataset.                                                                                                          | granularity
 Data Quality        | Whether the dataset meets the agency's Information Quality Guidelines (true/false).                                                                                                             | dataQuality
 Category            | Main thematic category of the dataset.                                                                                                        | theme
 Related Documents   | Related documents such as technical information about a dataset, developer documentation, etc.                                                                                            | references
-Size                | The size of the downloadable dataset.                                                                                                         | size
 Homepage URL        | Alternative landing page used to redirect user to a contextual, Agency-hosted "homepage" for the Dataset or API when selecting this resource from the Data.gov user interface. | landingPage
 RSS Feed            | URL for an RSS feed that provides access to the dataset.                                                                                      | feed
-=======
-{.table .table-striped}
-Field               | Definition                                                                                                                                    | JSON                 
-------              | ------                                                                                                                                        | ----                  
-Release Date        | Date of formal issuance.                                                                                                                      | issued         
-Frequency           | Frequency with which dataset is published.                                                                                                    | accrualPeriodicity    
-Language            | The language of the dataset.                                                                                                                  | language              
-Data Quality        | Whether the dataset meets the agency's Information Quality Guidelines (true/false).                                                                                                             | dataQuality          
-Category            | Main thematic category of the dataset.                                                                                                        | theme                 
-Related Documents   | Related documents such as technical information about a dataset, developer documentation, etc.                                                                                            | references            
-Homepage URL        | Alternative landing page used to redirect user to a contextual, Agency-hosted "homepage" for the Dataset or API when selecting this resource from the Data.gov user interface. | landingPage	            
-RSS Feed            | URL for an RSS feed that provides access to the dataset.                                                                                      | feed            
->>>>>>> master
 System of Records   | If the systems is designated as a system of records under the Privacy Act of 1974, provide the URL to the System of Records Notice related to this dataset. | systemOfRecords
 
-
 Further Metadata Field Guidance
 -------------------------------
 
@@ -316,20 +299,7 @@ Field       | title
 **Usage Notes** | Distribution is a concatenation, as appropriate, of the following elements: download url, format, endpoint, language, size.
 **Example** | `"distribution": [{"accessURL": "http://data.mcc.gov/example_resource/data.json", "format":"JSON", "size":"22mb"},{"accessURL":"http://data.mcc.gov/example_/data.xml", "format":"XML", "size":"24mb"}]`
 
-<<<<<<< HEAD
-{: .table .table-striped}
-**Field** | **size**
------ | -----
-**Cardinality** | (0,n)
-**Required** | No
-**Accepted Values** | See Usage Notes
-**Usage Notes** | Sizes should be formatted as (e.g.), 52kB, 140MB, 2GB.
-**Example** |  `{"size":"3MB"}`
-
 {: .table .table-striped}
-=======
-{.table .table-striped}
->>>>>>> master
 **Field** | **landingPage**
 ----- | -----
 **Cardinality** | (0,1)