diff --git a/content/dezentrale.md b/content/dezentrale.md
index ec1cbd1..4c7f9d5 100644
--- a/content/dezentrale.md
+++ b/content/dezentrale.md
@@ -90,11 +90,7 @@ Vorort in der [
 \
 \
 Den Vorstand unter der E-Mail-Adresse \
-<<<<<<< HEAD
-{{< value "mail" "vorstand" >}}
-=======
 {{< value "mail" "vorstand" >}} [(PGP-Key)]({{< value "mail" "vorstand_pgp_url" >}})
->>>>>>> 428d387 (Added PGP key and related information)
 
 {{< /page_col >}}
 {{< page_col centered >}}