WIP

site/index.md

@@ -110,19 +110,11 @@ become available.
 * **Competition phase**: June 8 - ~~June 25~~ June 28 2024 23:59 CET
   * During this phase, the training data will consist of the training data of the previous phase plus the labeled test data of the previous phase 
     and a new unlabeled test set is made available. You can upload the labels for 
-<<<<<<< HEAD
     the test set to the competition site and your latest submission will be the one that will be used for ranking. During that phase, the leaderboard is not shown. Please note that only submissions which adhere to all terms and rules are considered for the final ranking.
   * A preliminary leaderboard/ranking is shown after the end of the competition phase. 
   * The final leaderboard/ranking will be available once paper review and final submission is completed, on July ~~21st~~ 24th 2024.
 * **Paper submission due**: July 1, 2024
 * **Camera ready due**: July ~~20~~ 23, 2024
-=======
-    the test set to the competition site and your latest submission will be the one that will be used for ranking. Please note that only submissions which adhere to all terms and rules are considered for the final ranking.
-  * A preliminary final leaderboard/ranking is shown after the end of the competition phase. 
-  * The final leaderboard/ranking will be available once paper review and final submission is completed, on July 21th 2024.
-* **Paper submission due**: ~~July 1~~ July 3rd, 23:59 CET, 2024
-* **Camera ready due**: July 20, 2024
->>>>>>> 9b8256e3e4bfcea966f492f0d26e4e1c28902a9b
 * **[Shared Task @KONVENS](https://konvens-2024.univie.ac.at/)**: 10 September, 2024
 
 ## Feedback