general edits

content/03.01.05.PHIS.md

@@ -6,8 +6,14 @@ PHIS is deployed in several field and greenhouse platforms of the French nationa
 It manages and collects data from basic phenotyping and high-throughput phenotyping experiments on a daily basis. 
 PHIS unambiguously identifies the objects and traits in an experiment and establishes their types and relationships via ontologies and semantics.
 
+<<<<<<< HEAD
 Since its inception, PHIS has been designed to be BrAPI compliant, encompassing the Core, Phenotyping, and Germplasm BrAPI modules. 
 This enables integration with other BrAPI-compliant systems and platforms, simplifying the exchange of accession and phenotyping data across systems. PHIS is actively integrated with the genebank accessions management system [OLGA](https://crb-plantes-olga.fr/public/frontend/auth/login), and is indexed by the [FAIDARE](https://urgi.versailles.inrae.fr/faidare/) data portal [@https://urgi.versailles.inrae.fr/faidare].
 BrAPI-enabled interoperability promotes a more coherent and efficient approach to the management and use of phenotyping data on various platforms and research initiatives within the European scientific community.
 BrAPI compliance also ensures that PHIS is compatible with other standards such as the Minimal Information About a Plant Phenotyping Experiment ([MIAPPE](https://www.miappe.org/) [@doi:10.1111/nph.16544]).
 By integrating BrAPI requirements into its structure, PHIS not only meets the standards of the phenotyping field, but also strengthens its capacity for interoperability and effective collaboration in the wider context of plant breeding and related fields. 
+=======
+PHIS was designed to be BrAPI compliant since its inception. PHIS adheres to the standards and protocols specified by BrAPI and implements various services aligning with the BrAPI standards, encompassing the Core, Phenotyping, and Germplasm modules. This enables integration and compatibility with BrAPI-compliant systems and platforms, such as the genebank accessions management system [OLGA](https://crb-plantes-olga.fr/public/frontend/auth/login), to retrieve accession information. This prerequisite served as the basis for formalizing the data model, while also facilitating compatibility with other standards, such as the [Minimal Information About a Plant Phenotyping Experiment (MIAPPE)](https://www.miappe.org/) [@doi:10.1111/nph.16544]. By integrating BrAPI requirements into its structure, PHIS not only meets the standards of the phenotyping field, but also strengthens its capacity for interoperability and effective collaboration in the wider context of plant breeding and related fields. The fact that data within a PHIS instance can be queried through BrAPI services enables indexing of PHIS in the [FAIDARE](https://urgi.versailles.inrae.fr/faidare/) data portal [@https://hal.inrae.fr/hal-04425516].
+
+Furthermore, as PHIS offers BrAPI-compliant web services, it simplifies the integration and data exchange with other European information systems that handle phenotyping data. The adhesion to BrAPI standards ensures a common interface and compatibility, facilitating communication and collaboration between PHIS and other systems in the European context. This interoperability not only eases data sharing, but also promotes a more coherent and efficient approach to the management and use of phenotyping data on various platforms and research initiatives within the European scientific community.
+>>>>>>> 0b95ffa (general edits)

content/03.01.07.Trait_Selector_BrAPP.md

@@ -4,10 +4,14 @@
 <!-- the "BrAPP" description part should better fit at the beginning of the section. -->
 <!-- BrAPPs are simple tools developed by the BrAPI community that are entirely reliant on BrAPI for their data requirements. Often, they are JavaScript based applications or visualizations that fit on a single web page. This means a single BrAPP can be easily shared and used by many organizations and systems, as long as those organizations have the standard BrAPI endpoints available. -->
 
+<<<<<<< HEAD
 The [Trait Selector BrAPP](https://github.com/solgenomics/BrAPI-Trait-selector) is a JavaScript-based application used to visually search and select traits from an ontology. 
 The Trait Selector employs a visual aid, an image of a plant, to connect plant anatomy with relevant trait ontology terms. 
 Instead of scrolling through a long list of possible traits, the user can click on pieces of the image to show the traits associated with specific plant structures.
 The Trait Selector BrAPP can be used to quickly find specific traits or to identify accessions that have a specific phenotype of interest.
+=======
+The [Trait Selector BrAPP](https://github.com/solgenomics/BrAPI-Trait-selector) is used to search and select meaningful traits, with a visual aid to help the user find exactly what they need. Instead of searching through a long list of possible traits, the user is presented with a cartoon image of a species. They can then click on pieces of the image to show traits associated to that part of the plant. For a breeder, they might use it to quickly find specific traits to study. For a genebank user, they might use it to find varieties that have a specific trait they are interested in.
+>>>>>>> 0b95ffa (general edits)
 
 The Trait Selector BrAPP has been successfully added to Cassavabase[@doi:10.1093/g3journal/jkac078] and MGIS[@doi:10.1093/database/bax046], and it can be integrated into any website or system with a BrAPI-compatible data source. 
 A breeding database would need to only implement the BrAPI endpoints for Traits, Observations, and Variables, while a genebank would require only Traits and Germplasm Attributes.