Fixed merge mistake in observation

spec/shr_observation.txt

@@ -33,34 +33,11 @@ Value:			0..1 (Quantity or CodeableConcept could be from ObservationResultVS or
 0..1			Comment
 //----------- Related and Sub-Observations
 0..1			PanelMembers  // separate observations occurring in a panel
-0..1			ObservationMethod
 0..1			ClinicallyRelevantTime
 0..*			Participant 	// TODO: add to metadata?
 0..*			Setting
 0..*			Location
 
-		Element:		ObservationCode
-		Based on:		ActionCode
-		Concept:		TBD
-		Description:	"A term from a controlled vocabulary that defines the data element (the question, not the answer) as specifically as possible. The specific code should always align with the concept of the element, but may be more specific. For example, the concept associated with medications is code for 'medication used', but the ObservationCode is the code for the particular medication used. For tests, ObservationCode identifies the specific test being performed, and for observations, the specific question being asked."
-		Value:			CodeableConcept
-
-		Element:		ObservationCategory
-		Concept:		TBD
-		Description:	"A categorization of the observation according to how the observation was collected or its clinical area."
-		Value:			CodeableConcept from http://hl7.org/fhir/ValueSet/observation-category /* or CodeableConcept */
-
-		Element:		ObservationReason
-		Concept:		TBD
-		Based on:		Reason
-		Description:	"The reason for making the observation."
-
-		Element:		ObservationNonOccurrenceModifier
-		Concept:		TBD
-		Based on:		NonOccurrenceModifier
-		Description:	"True if the observation did not occcur, e.g., if a test was not performed or the assessment was not done, when it might otherwise be expected."
-						Reason with CodeableConcept from ObservationNotMadeReasonVS
-
 		Element:		AssociatedStudy
 		Concept:		TBD
 		Description:	"The clinical trial or other formal study related to this finding."