fix merge conflict

src/views/ContactsPage/ContactsPageView.tsx

@@ -8,10 +8,10 @@ import BoardJson from "./board.json";
 import HvtmkJson from "./hvtmk.json";
 import MtmkJson from "./mtmk.json";
 import OptmkJson from "./optmk.json";
-// import OtmkJson from "./otmk.json";
-// import EPtmkJson from "./eptmk.json";
-// import SstmkJson from "./sstmk.json";
-// import TtmkJson from "./ttmk.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";
@@ -21,10 +21,10 @@ const orderedCommittees = [
   HvtmkJson,
   MtmkJson,
   OptmkJson,
-  // OtmkJson,
-  // EPtmkJson,
-  // SstmkJson,
-  // TtmkJson,
+  OtmkJson,
+  EPtmkJson,
+  SstmkJson,
+  TtmkJson,
   // UtmkJson,
   // YtmkJson,
   // Others,

src/views/ContactsPage/eptmk.json

@@ -3,6 +3,15 @@
   "name_fi": "Elepajatoimikunta",
   "name_en": "",
   "roles": [
+    {
+      "name_fi": "Pajapäävastaava",
+      "name_en": "",
+      "representatives": [
+        {
+          "name": "Oskari Ponkala"
+        }
+      ]
+    },
     {
       "name_fi": "Pajavastaava",
       "name_en": "",
@@ -16,35 +25,26 @@
       "name_fi": "Pajakisälli",
       "name_en": "",
       "representatives": [
-        {
-          "name": "Tommi Sytelä"
-        },
-        {
-          "name": "Eerikki Eskola"
-        },
-        {
-          "name": "Arkadii Kolchin"
-        },
         {
           "name": "Samu Nyman"
         },
         {
-          "name": "Konsta Langi"
+          "name": "Veikko Räty"
         },
         {
-          "name": "Johannes Viirimäki"
+          "name": "Ville Lairila"
         },
         {
           "name": "Justus Ojala"
         },
         {
-          "name": "Ville Tujunen"
+          "name": "Tommi Sytelä"
         },
         {
-          "name": "Antti Tarkka"
+          "name": "Visa Kurvi"
         },
         {
-          "name": "Pyry Vaara"
+          "name": "Petrus Asikainen"
         }
       ]
     }

src/views/ContactsPage/otmk.json

@@ -8,7 +8,7 @@
       "name_en": "Master of Ceremonies",
       "representatives": [
         {
-          "name": "Eveliina Ahonen"
+          "name": "Sakke Kangas"
         }
       ]
     },
@@ -17,43 +17,40 @@
       "name_en": "Court Counsellor",
       "representatives": [
         {
-          "name": "Melisa Dönmez"
+          "name": "Eero Ketonen"
         }
       ]
     },
     {
       "name_fi": "Emäntä",
-      "name_en": "",
+      "name_en": "Hostess",
       "representatives": [
         {
-          "name": "Oona Karjalainen"
-        },
-        {
-          "name": "Emilia Kortelainen"
-        },
-        {
-          "name": "Venla Vastamäki"
+          "name": "Elina Huttunen"
         }
       ]
     },
     {
       "name_fi": "Isäntä",
-      "name_en": "",
+      "name_en": "Host",
       "representatives": [
         {
-          "name": "Henry Jaakkola"
+          "name": "Aleksi Saajakari"
         },
         {
-          "name": "Sakke Kangas"
+          "name": "Aaron Löfgren"
         },
         {
-          "name": "Otto Torkkeli"
+          "name": "Verneri Turkki"
         },
         {
-          "name": "Tommi Oinonen"
+          "name": "Elias Lindberg"
         },
         {
-          "name": "Eero Ketonen"
+          "name": "Roni Vallius"
+        },
+        {
+          "name": "Elias Damski"
         }
       ]
     },
@@ -62,28 +59,22 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Tuomo Leino"
-        },
-        {
-          "name": "Jami Hyytiäinen"
-        },
-        {
-          "name": "Tuomas Pajunpää"
-        },
-        {
-          "name": "Samuel Laine"
-        },
-        {
-          "name": "Toni Miilunpalo"
-        },
-        {
-          "name": "Ville Kaakinen"
+          "name": "Sakari Harjunpää"
         },
         {
           "name": "Eero Torpo"
         },
         {
-          "name": "Sauli Norja"
+          "name": "Niilo Ojala"
+        },
+        {
+          "name": "Samuel Laine"
+        },
+        {
+          "name": "Toni Ojala"
+        },
+        {
+          "name": "Ville Kaakinen"
         }
       ]
     },
@@ -92,22 +83,22 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Jesse Räisänen"
+          "name": "Oona Karjalainen"
         },
         {
-          "name": "Eino Laakso"
+          "name": "Peter Lindahl"
         },
         {
-          "name": "Sakari Harjunpää"
+          "name": "Aino Suomi"
         },
         {
-          "name": "Niilo Ojala"
+          "name": "Sauli Norja"
         },
         {
-          "name": "Iikka Huttu"
+          "name": "Venla Vastamäki"
         },
         {
-          "name": "Akseli Järvinen"
+          "name": "Kasper Skog"
         }
       ]
     }

src/views/ContactsPage/sstmk.json

@@ -70,7 +70,7 @@
       ]
     },
     {
-      "name_fi": "PoTa100-jatkokuvernööri",
+      "name_fi": "PoTa100-jatkotirehtööri",
       "name_en": "",
       "representatives": [
         {

src/views/ContactsPage/ttmk.json

@@ -5,49 +5,43 @@
   "roles": [
     {
       "name_fi": "Teknologiamestari",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Oskari Ponkala"
-        }
-      ]
-    },
-    {
-      "name_fi": "Tekniikkavastaava",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Antti Mäki"
-        }
-      ]
-    },
-    {
-      "name_fi": "Web-Kisälli",
-      "name_en": "",
+      "name_en": "Master of technology",
       "representatives": [
         {
           "name": "Ilari Ojakorpi"
-        },
+        }
+      ]
+    },
+    {
+      "name_fi": "Teknologianeuvos",
+      "name_en": "Technology Advisor",
+      "representatives": [
         {
-          "name": "Leo Lahti"
-        },
-        {
-          "name": "Jyri Korhonen"
-        },
-        {
-          "name": "Tuukka Syrjänen"
-        },
-        {
-          "name": "Emmaleena Ahonen"
-        },
-        {
-          "name": "Mikko Suhonen"
+          "name": "Aarni Halinen"
         },
         {
           "name": "Jaakko Koskela"
         },
+        {
+          "name": "Toni Lyttinen"
+        }
+      ]
+    },
+    {
+      "name_fi": "Teknologiakisälli",
+      "name_en": "",
+      "representatives": [
+        {
+          "name": "Elmo Kankkunen"
+        },
+        {
+          "name": "Antti Eronen"
+        },
         {
           "name": "Justus Ojala"
+        },
+        {
+          "name": "Lasse Ruokokoski"
         }
       ]
     }