Merge remote-tracking branch 'origin/main' into feature/add-citations

Signed-off-by: Martijn Govers <[email protected]>

Author: mgovers

CITATION.cff

@@ -40,7 +40,10 @@ references:
         given-names: "Yu"
         email: "[email protected]"
         affiliation: "Alliander"
+<<<<<<< HEAD
         orcid: "https://orcid.org/0000-0001-5889-0067"
+=======
+>>>>>>> origin/main
       - family-names: "Salemink"
         given-names: "Peter"
         email: "[email protected]"
@@ -50,14 +53,22 @@ references:
         given-names: "Werner"
         email: [email protected]
         affiliation: "Alliander"
+<<<<<<< HEAD
         orcid: "https://orcid.org/0000-0002-4058-2581"
+=======
+>>>>>>> origin/main
       - family-names: "Bharambe"
         given-names: "Nitish"
         email: "[email protected]"
         affiliation: "Alliander"
+<<<<<<< HEAD
         orcid: "https://orcid.org/0009-0007-9694-6077"
       - family-names: "Govers"
         given-names: "Martinus G.H."
+=======
+      - family-names: "Govers"
+        given-names: "Martinus"
+>>>>>>> origin/main
         email: "[email protected]"
         affiliation: "Alliander"
         orcid: "https://orcid.org/0009-0008-6890-8353"
@@ -73,10 +84,16 @@ references:
         email: "[email protected]"
         affiliation: "Alliander"
       - family-names: "Guo"
+<<<<<<< HEAD
         given-names: "Jerry Jinfeng"
         email: "[email protected]"
         affiliation: "Alliander"
         orcid: "https://orcid.org/0000-0002-8065-4084"
+=======
+        given-names: "Jerry"
+        email: "[email protected]"
+        affiliation: "Alliander"
+>>>>>>> origin/main
       - family-names: "Jagutis"
         given-names: "Laurynas"
         email: "[email protected]"