diff --git a/docs/fencing/CAN.ics b/docs/fencing/CAN.ics
index 35bbdb47f..916816a57 100644
--- a/docs/fencing/CAN.ics
+++ b/docs/fencing/CAN.ics
@@ -103,16 +103,6 @@ SUMMARY:🤺 Jessica Zi Jia GUO 🇨🇦 - 🇨🇱 Arantza INOSTROZA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120500Z-fencing-WOMENS-FOIL-INDIVIDUAL-TABLE-OF-16
-DTSTAMP:20240728T120500Z
-DTSTART:20240728T120500Z
-DTEND:20240728T123500Z
-DESCRIPTION:Fencing - Women's Foil Individual Table of 16\n🇨🇦 Yunjia
-  ZHANG
-SUMMARY:🤺 Women's Foil Individual Table of 16
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T072500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-64-CAN-ISV
 DTSTAMP:20240729T072500Z
 DTSTART:20240729T072500Z
diff --git a/docs/fencing/general.ics b/docs/fencing/general.ics
index 3942f96bd..7d969ec98 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -971,8 +971,7 @@ UID:20240728T120500Z-fencing-WOMENS-FOIL-INDIVIDUAL-TABLE-OF-16
 DTSTAMP:20240728T120500Z
 DTSTART:20240728T120500Z
 DTEND:20240728T123500Z
-DESCRIPTION:Fencing - Women's Foil Individual Table of 16\n🇨🇦 Yunjia
-  ZHANG
+DESCRIPTION:Fencing - Women's Foil Individual Table of 16
 SUMMARY:🤺 Women's Foil Individual Table of 16
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/general/CAN.ics b/docs/general/CAN.ics
index f95d01a9a..db694d9a2 100644
--- a/docs/general/CAN.ics
+++ b/docs/general/CAN.ics
@@ -614,16 +614,6 @@ SUMMARY:⛵ Women's Skiff - Race 3
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120500Z-fencing-WOMENS-FOIL-INDIVIDUAL-TABLE-OF-16
-DTSTAMP:20240728T120500Z
-DTSTART:20240728T120500Z
-DTEND:20240728T123500Z
-DESCRIPTION:Fencing - Women's Foil Individual Table of 16\n🇨🇦 Yunjia
-  ZHANG
-SUMMARY:🤺 Women's Foil Individual Table of 16
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T120700Z-sailing-MENS-SKIFF-RACE-2
 DTSTAMP:20240728T120700Z
 DTSTART:20240728T120700Z
diff --git a/docs/general/ISR.ics b/docs/general/ISR.ics
index 46143fd42..ddb27a97f 100644
--- a/docs/general/ISR.ics
+++ b/docs/general/ISR.ics
@@ -188,18 +188,6 @@ SUMMARY:🥋 Nurali EMOMALI 🇹🇯 - 🇮🇱 Baruch SHMAILOV
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-<<<<<<< HEAD
-UID:20240728T093000Z-judo-WOMEN-52-KG-ELIMINATION-ROUND-OF-16
-DTSTAMP:20240728T093000Z
-DTSTART:20240728T093000Z
-DTEND:20240728T093600Z
-DESCRIPTION:Judo - Women -52 kg Elimination Round of 16\n🇮🇱 Gefen PRIMO
-SUMMARY:🥋 Women -52 kg Elimination Round of 16
-LOCATION:Champ-de-Mars Arena
-END:VEVENT
-BEGIN:VEVENT
-=======
->>>>>>> 50ece52 (add medal only events)
 UID:20240728T101300Z-sailing-WOMENS-WINDSURFING-RACE-1
 DTSTAMP:20240728T101300Z
 DTSTART:20240728T101300Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index dfe83d322..e2b0b4cf4 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -4608,7 +4608,7 @@ UID:20240728T093000Z-judo-WOMEN-52-KG-ELIMINATION-ROUND-OF-16
 DTSTAMP:20240728T093000Z
 DTSTART:20240728T093000Z
 DTEND:20240728T093600Z
-DESCRIPTION:Judo - Women -52 kg Elimination Round of 16\n🇮🇱 Gefen PRIMO
+DESCRIPTION:Judo - Women -52 kg Elimination Round of 16
 SUMMARY:🥋 Women -52 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
@@ -6041,8 +6041,7 @@ UID:20240728T120500Z-fencing-WOMENS-FOIL-INDIVIDUAL-TABLE-OF-16
 DTSTAMP:20240728T120500Z
 DTSTART:20240728T120500Z
 DTEND:20240728T123500Z
-DESCRIPTION:Fencing - Women's Foil Individual Table of 16\n🇨🇦 Yunjia
-  ZHANG
+DESCRIPTION:Fencing - Women's Foil Individual Table of 16
 SUMMARY:🤺 Women's Foil Individual Table of 16
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/judo/ISR.ics b/docs/judo/ISR.ics
index 0092e322e..6d2c9670e 100644
--- a/docs/judo/ISR.ics
+++ b/docs/judo/ISR.ics
@@ -58,18 +58,6 @@ SUMMARY:🥋 Nurali EMOMALI 🇹🇯 - 🇮🇱 Baruch SHMAILOV
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-<<<<<<< HEAD
-UID:20240728T093000Z-judo-WOMEN-52-KG-ELIMINATION-ROUND-OF-16
-DTSTAMP:20240728T093000Z
-DTSTART:20240728T093000Z
-DTEND:20240728T093600Z
-DESCRIPTION:Judo - Women -52 kg Elimination Round of 16\n🇮🇱 Gefen PRIMO
-SUMMARY:🥋 Women -52 kg Elimination Round of 16
-LOCATION:Champ-de-Mars Arena
-END:VEVENT
-BEGIN:VEVENT
-=======
->>>>>>> 50ece52 (add medal only events)
 UID:20240729T080000Z-judo-MEN-73-KG-ELIMINATION-ROUND-OF-32-ISR-ALG
 DTSTAMP:20240729T080000Z
 DTSTART:20240729T080000Z
diff --git a/docs/judo/general.ics b/docs/judo/general.ics
index 922d099e6..da6f9c93c 100644
--- a/docs/judo/general.ics
+++ b/docs/judo/general.ics
@@ -846,7 +846,7 @@ UID:20240728T093000Z-judo-WOMEN-52-KG-ELIMINATION-ROUND-OF-16
 DTSTAMP:20240728T093000Z
 DTSTART:20240728T093000Z
 DTEND:20240728T093600Z
-DESCRIPTION:Judo - Women -52 kg Elimination Round of 16\n🇮🇱 Gefen PRIMO
+DESCRIPTION:Judo - Women -52 kg Elimination Round of 16
 SUMMARY:🥋 Women -52 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
diff --git a/docs/today.html b/docs/today.html
index f858ae116..97ed1c7ed 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -4053,11 +4053,7 @@
    </div>
  </div>
 </div>
-<<<<<<< HEAD
-<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GER,AUS,CHN,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,ESP,HUN,CZE,ECU,FIN,DEN,ESP,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,FIN,RSA,CHN,POR,MAR,AUT,CZE,ECU,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
-=======
 <div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GER,CHN,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,ESP,HUN,CZE,ECU,FIN,DEN,ESP,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,FIN,RSA,CHN,POR,MAR,AUT,CZE,ECU,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
->>>>>>> 50ece52 (add medal only events)
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">EQUESTRIAN</div>
@@ -4587,12 +4583,11 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T093000Z" data-end="20240728T093600Z" data-noc="ISR">
+<div class="event py-4" data-start="20240728T093000Z" data-end="20240728T093600Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">JUDO</div>
    <div class="">Women -52 kg Elimination Round of 16
-<div class="competitor ISR">🇮🇱 Gefen PRIMO</div>
    </div>
  </div>
 </div>
@@ -6067,12 +6062,11 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T120500Z" data-end="20240728T123500Z" data-noc="CAN">
+<div class="event py-4" data-start="20240728T120500Z" data-end="20240728T123500Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">FENCING</div>
    <div class="">Women's Foil Individual Table of 16
-<div class="competitor CAN">🇨🇦 Yunjia ZHANG</div>
    </div>
  </div>
 </div>