From e024ce06eaedea808b9c787541ad9072a1e546ae Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <miroslav.kratochvil@uni.lu>
Date: Mon, 24 Oct 2022 09:27:16 +0200
Subject: [PATCH] fix merge fails

---
 src/types/models/SBMLModel.jl     | 13 ++++++-------
 src/types/models/StandardModel.jl |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/types/models/SBMLModel.jl b/src/types/models/SBMLModel.jl
index 2f79098a7..ccc21de46 100644
--- a/src/types/models/SBMLModel.jl
+++ b/src/types/models/SBMLModel.jl
@@ -227,7 +227,7 @@ $(TYPEDSIGNATURES)
 
 Return the annotations of reaction with ID `rid`.
 """
-reaction_annotations(model::SBMLModel, rid::String) =
+Accessors.reaction_annotations(model::SBMLModel, rid::String) =
     _sbml_import_cvterms(model.sbml.reactions[rid].sbo, model.sbml.reactions[rid].cv_terms)
 
 """
@@ -235,7 +235,7 @@ $(TYPEDSIGNATURES)
 
 Return the annotations of metabolite with ID `mid`.
 """
-metabolite_annotations(model::SBMLModel, mid::String) =
+Accessors.metabolite_annotations(model::SBMLModel, mid::String) =
     _sbml_import_cvterms(model.sbml.species[mid].sbo, model.sbml.species[mid].cv_terms)
 
 """
@@ -243,7 +243,7 @@ $(TYPEDSIGNATURES)
 
 Return the annotations of gene with ID `gid`.
 """
-gene_annotations(model::SBMLModel, gid::String) = _sbml_import_cvterms(
+Accessors.gene_annotations(model::SBMLModel, gid::String) = _sbml_import_cvterms(
     model.sbml.gene_products[gid].sbo,
     model.sbml.gene_products[gid].cv_terms,
 )
@@ -253,7 +253,7 @@ $(TYPEDSIGNATURES)
 
 Return the notes about reaction with ID `rid`.
 """
-reaction_notes(model::SBMLModel, rid::String) =
+Accessors.reaction_notes(model::SBMLModel, rid::String) =
     _sbml_import_notes(model.sbml.reactions[rid].notes)
 
 """
@@ -261,7 +261,7 @@ $(TYPEDSIGNATURES)
 
 Return the notes about metabolite with ID `mid`.
 """
-metabolite_notes(model::SBMLModel, mid::String) =
+Accessors.metabolite_notes(model::SBMLModel, mid::String) =
     _sbml_import_notes(model.sbml.species[mid].notes)
 
 """
@@ -269,7 +269,7 @@ $(TYPEDSIGNATURES)
 
 Return the notes about gene with ID `gid`.
 """
-gene_notes(model::SBMLModel, gid::String) =
+Accessors.gene_notes(model::SBMLModel, gid::String) =
     _sbml_import_notes(model.sbml.gene_products[gid].notes)
 
 """
@@ -302,7 +302,6 @@ function Base.convert(::Type{SBMLModel}, mm::MetabolicModel)
                 metid(mid) => SBML.Species(
                     name = metabolite_name(mm, mid),
                     compartment = default("compartment", comps[mi]),
-                    formula = metabolite_formula(mm, mid),
                     formula = maybemap(unparse_formula, metabolite_formula(mm, mid)),
                     charge = metabolite_charge(mm, mid),
                     constant = false,
diff --git a/src/types/models/StandardModel.jl b/src/types/models/StandardModel.jl
index 8a96c5907..05f0915e8 100644
--- a/src/types/models/StandardModel.jl
+++ b/src/types/models/StandardModel.jl
@@ -235,7 +235,7 @@ $(TYPEDSIGNATURES)
 Return the notes associated with gene `id` in `model`.
 Return an empty Dict if not present.
 """
-Accessors.gene_notes(model::StandardModel, id::String)::Maybe{Notes} = model.genes[id].notes
+Accessors.gene_notes(model::StandardModel, gid::String) = model.genes[gid].notes
 
 """
 $(TYPEDSIGNATURES)