some more merge fixes

src/views/ContactsPage/ContactsPageView.tsx

@@ -5,29 +5,26 @@ import colors from "@theme/colors";
 import ContactCard from "@components/ContactCard";
 
 import BoardJson from "./board.json";
-// import HvtmkJson from "./hvtmk.json";
-// import MtmkJson from "./mtmk.json";
-// import OptmkJson from "./optmk.json";
+import UtmkJson from "./utmk.json";
+import YtmkJson from "./ytmk.json";
+import Others from "./others.json";
 import OtmkJson from "./otmk.json";
 import EPtmkJson from "./eptmk.json";
 import SstmkJson from "./sstmk.json";
 import TtmkJson from "./ttmk.json";
-// import UtmkJson from "./utmk.json";
-// import YtmkJson from "./ytmk.json";
-// import Others from "./others.json";
 
 const orderedCommittees = [
   BoardJson,
-  // HvtmkJson,
-  // MtmkJson,
-  // OptmkJson,
+  UtmkJson,
+  YtmkJson,
+  Others,
   OtmkJson,
   EPtmkJson,
   SstmkJson,
   TtmkJson,
-  // UtmkJson,
-  // YtmkJson,
-  // Others,
+  UtmkJson,
+  YtmkJson,
+  Others,
 ];
 
 const blankProfile = "/img/blank_profile.png";

src/views/ContactsPage/others.json

@@ -8,7 +8,7 @@
       "name_en": "Guild elder",
       "representatives": [
         {
-          "name": "Erna Virtanen",
+          "name": "Toni Lyttinen",
           "phone_number": null,
           "email": null
         },
@@ -16,6 +16,16 @@
           "name": "Emmaleena Ahonen",
           "phone_number": null,
           "email": null
+        },
+        {
+          "name": "Johannes Ora",
+          "phone_number": null,
+          "email": null
+        },
+        {
+          "name": "Antti Mäki",
+          "phone_number": null,
+          "email": null
         }
       ]
     },
@@ -24,18 +34,7 @@
       "name_en": "TEK contact person",
       "representatives": [
         {
-          "name": "Mikael Liimatainen",
-          "phone_number": null,
-          "email": null
-        }
-      ]
-    },
-    {
-      "name_fi": "Sklubi-yhdyshenkilö",
-      "name_en": "Sklubi contact person",
-      "representatives": [
-        {
-          "name": "Ella Eilola",
+          "name": "Oskari Ponkala",
           "phone_number": null,
           "email": null
         }
@@ -46,12 +45,39 @@
       "name_en": "Archivist",
       "representatives": [
         {
-          "name": "Antti Mäki",
+          "name": "Timi Tiira",
+          "phone_number": null,
+          "email": null
+        }
+      ]
+    },
+    {
+      "name_fi": "Häirintäyhdydyshenkilö",
+      "name_en": "",
+      "representatives": [
+        {
+          "name": "Toni Ojala",
           "phone_number": null,
           "email": null
         },
         {
-          "name": "Jonna Tammikivi",
+          "name": "Aino Suomi",
+          "phone_number": null,
+          "email": null
+        },
+        {
+          "name": "Sauli Norja",
+          "phone_number": null,
+          "email": null
+        }
+      ]
+    },
+    {
+      "name_fi": "Somevastaava",
+      "name_en": "",
+      "representatives": [
+        {
+          "name": "Aaron Löfgren",
           "phone_number": null,
           "email": null
         }

src/views/ContactsPage/utmk.json

@@ -8,7 +8,16 @@
       "name_en": "Master of External Affairs",
       "representatives": [
         {
-          "name": "Oliver Hiekkamies"
+          "name": "Heidi Mäkitalo"
+        }
+      ]
+    },
+    {
+      "name_fi": "Kv-Fuksikapteeni",
+      "name_en": "",
+      "representatives": [
+        {
+          "name": "Suvi Karanta"
         }
       ]
     },
@@ -17,7 +26,7 @@
       "name_en": "International Tutor Coordinator",
       "representatives": [
         {
-          "name": "Elias Hirvonen"
+          "name": "Pyry Vaara"
         }
       ]
     },
@@ -26,7 +35,17 @@
       "name_en": "International Helper",
       "representatives": [
         {
-          "name": "Ville-Pekka Laakkonen"
+          "name": "Aaro Niskanen"
+        },
+        {
+          "name": "Eerik Eskola"
+        }
+        ,
+        {
+          "name": "Oona Karjalainen"
+        },
+        {
+          "name": "Aleksi Helin"
         }
       ]
     },
@@ -35,22 +54,34 @@
       "name_en": "Apprentice of External Affairs",
       "representatives": [
         {
-          "name": "Leo Müller"
+          "name": "Nestori Yrjönkoski"
+        },
+        {
+          "name": "Johannes Ora"
         },
         {
           "name": "Eino Tyrvänen"
         },
         {
-          "name": "Pekka Aho"
+          "name": "Jenni Marttinen"
         }
       ]
     },
     {
-      "name_fi": "Ulkowanhus",
+      "name_fi": "Ulkowanhus & Ulkopatruuna",
       "name_en": "",
       "representatives": [
         {
-          "name": "Jyri Korhonen"
+          "name": "Oliver Hiekkamies"
+        }
+      ]
+    },
+    {
+      "name_fi": "KVummisetä",
+      "name_en": "",
+      "representatives": [
+        {
+          "name": "Elias Hirvonen"
         }
       ]
     }

src/views/ContactsPage/ytmk.json

@@ -8,7 +8,7 @@
       "name_en": "Master of Corporate Relations",
       "representatives": [
         {
-          "name": "Otto Julkunen"
+          "name": "Tommi Oinonen"
         }
       ]
     },
@@ -21,30 +21,33 @@
         }
       ]
     },
+    {
+      "name_fi": "Excursiovastaava",
+      "name_en": "",
+      "representatives": [
+        {
+          "name": "Visa Kurvi"
+        }
+      ]
+    },
     {
       "name_fi": "Yrityssuhdevastaava",
       "name_en": "Apprentice of Corporate Relations",
       "representatives": [
         {
-          "name": "Iikka Huttu"
-        },
-        {
-          "name": "Arkadii Kolchin"
-        },
-        {
-          "name": "Oskari Luukkonen"
-        },
-        {
-          "name": "Niilo Ojala"
+          "name": "Melina Sundell"
         },
         {
           "name": "Emma Reinikainen"
         },
         {
-          "name": "Melina Sundell"
+          "name": "Iida Luoma"
         },
         {
           "name": "Elma Tuohimetsä"
+        },
+        {
+          "name": "Nestori Yrjönkoski"
         }
       ]
     }

src/views/HonoraryPage/HonoraryPageView.tsx

@@ -530,6 +530,19 @@ const HonoraryPageView: React.FC = () => (
           <li>2020 Tuomas Lampinen</li>
           <li>2020 Toni Ojala</li>
         </ul>
+        <ul>
+          <li>2021 Elma Tuohimetsä</li>
+          <li>2021 Emmaleena Ahonen</li>
+          <li>2021 Jonna Tammikivi</li>
+          <li>2021 Samuel Laine</li>
+          <li>2021 Ilari Ojakorpi</li>
+          <li>2021 Jyri Korhonen</li>
+          <li>2021 Oskari Luostarinen</li>
+          <li>2021 Mikko Suhonen</li>
+          <li>2021 Jesse Räisänen</li>
+          <li>2021 Sofia Öhman</li>
+          <li>2021 Suvi Karanta</li>
+        </ul>
       </div>
     </TextSection>
   </>