it seems, I am quite bad at this merge stuff

documentation/index.rst

@@ -7,38 +7,6 @@ In science, shared tasks are crucial for collecting diverse approaches to tackle
    :margin: 4 4 0 0
    :gutter: 1
 
-<<<<<<< HEAD
-   .. grid-item-card:: For Participants
-      :class-card: sd-text-white
-      :class-body: sd-fs-12 sd-px-0
-      :img-background: images/bg.svg
-      :img-alt:
-      :text-align: center
-      :link: userintropage
-      :link-type: ref
-
-      How to use tira.io or other hosted instances of TIRA
-
-   .. grid-item-card:: For Organizers
-      :class-card: sd-text-white
-      :class-body: sd-fs-12 sd-px-0
-      :img-background: images/bg.svg
-      :img-alt:
-      :text-align: center
-      :link: orgintropage
-      :link-type: ref
-
-      Create new shared tasks or host your own TIRA instance
-
-   .. grid-item-card:: For Developers
-      :class-card: sd-text-white
-      :class-body: sd-fs-12 sd-px-0
-      :img-background: images/bg.svg
-      :img-alt:
-      :text-align: center
-      :link: devintropage
-      :link-type: ref
-=======
    .. grid-item-card:: :octicon:`person` For Users
       :link: users/intro
       :link-type: doc
@@ -54,7 +22,6 @@ In science, shared tasks are crucial for collecting diverse approaches to tackle
    .. grid-item-card:: :octicon:`code-square` For Developers
       :link: development/index
       :link-type: doc
->>>>>>> 4e23a9769a87d8df4f17ef0c4ed9d25989676320
 
       Help extend TIRA and make it more awesome than ever