new

README.md

@@ -1,13 +1,12 @@
 [![Build Status](https://travis-ci.org/cmungall/patient-phenotype-submission-format.svg?branch=master)](https://travis-ci.org/cmungall/patient-phenotype-submission-format)
 [![DOI](https://zenodo.org/badge/13996/cmungall/patient-phenotype-submission-format.svg)](https://zenodo.org/badge/latestdoi/13996/cmungall/patient-phenotype-submission-format)
 
-<<<<<<< HEAD
-## Walk-through example
-=======
 The health of an individual organism results from a complex interplay between its genes and environment. Although great strides have been made in standardizing the representation of genetic information for exchange, there are no comparable standards to represent phenotypes (e.g. patient symptoms and disease features) and environmental factors (Figure 1). Phenotypic abnormalities of individual organisms are currently described in diverse places and in diverse formats: publications, databases, health records, registries, clinical trials, and even social media. However, the lack of standardization, accessibility, and computability among these contexts makes it extremely difficult to effectively extract and utilize these data, hindering the understanding of genetic and environmental contributions to disease. 
 
 For more information, start with [requirements.md](requirements.md)
->>>>>>> 312cba4a7d9935cdf0041ef6e721b0e764815f71
+
+## Walk-through example
+
 
 Phenopackets can be encoded in either JSON or YAML, there is no
 difference between the two. We will use YAML here for compactness.
@@ -119,8 +118,3 @@ phenotype_profile:
  label: Amyotrophic lateral sclerosis
 
 ```
-
-<<<<<<< HEAD
-=======
-Then look at the examples directory.
->>>>>>> 312cba4a7d9935cdf0041ef6e721b0e764815f71