diff --git a/Defensio/03_Praesentation_Florian_Edlmayer.md b/Defensio/03_Praesentation_Florian_Edlmayer.md
index e0f4ae7..8f041a1 100644
--- a/Defensio/03_Praesentation_Florian_Edlmayer.md
+++ b/Defensio/03_Praesentation_Florian_Edlmayer.md
@@ -72,25 +72,14 @@
 ## DSGVO & Datenschutz
 - **Rechtliche Basis**: Einhaltung von DSGVO & DSG.
 - **Umsetzung**:
-  - **Datenschutzerklärung**: Rechtskonform integriert.
-  - **Datenminimierung**: Nur zwingend benötigte Daten.
-  - **Vertraulichkeit**: TLS/HTTPS & lokales Austria-Hosting.
-  - **Betroffenenrechte**: Auskunft & Löschung garantiert.
 
 \begin{center}
 \begin{tikzpicture}[
-<<<<<<< HEAD
     node distance=0.5cm,
     stepnode/.style={rectangle, rounded corners=3pt, minimum width=4.2cm, minimum height=2.2cm, draw, line width=1pt, fill=white, inner sep=2pt},
     iconnode/.style={circle, minimum size=0.8cm, fill=gray!5},
     titlenode/.style={align=center, font=\scriptsize\bfseries},
     arrow/.style={-latex, line width=1.5pt, color=accent!60}
-=======
-    node distance=0cm,
-    stepnode/.style={rectangle, rounded corners=3pt, minimum width=2.7cm, minimum height=2.6cm, draw, line width=1pt, fill=white, inner sep=2pt},
-    iconnode/.style={circle, minimum size=0.8cm, fill=gray!5},
-    titlenode/.style={align=center, font=\scriptsize\bfseries},
->>>>>>> 803bdb234a8828ce66f183a23b58191a2c208a40
 ]
     % Obere Reihe
     \node[stepnode, draw=gray]           (n1) at (0,0) {};
@@ -100,7 +89,6 @@
     \node[stepnode, draw=blue!60!black,  below=of n1] (n3) {};
     \node[stepnode, draw=orange,         below=of n2] (n4) {};
 
-<<<<<<< HEAD
     % Icons – obere Reihe
     \node[iconnode] at (n1.north) [yshift=-0.7cm] {\color{gray}\small\faFileAlt};
     \node[iconnode] at (n2.north) [yshift=-0.7cm] {\color{green!60!black}\small\faFilter};
@@ -119,13 +107,6 @@
     \draw[arrow] (n1) -- (n2);
     \draw[arrow] (n2) -- (n4);
     \draw[arrow] (n3) -- (n4);
-=======
-    % Titles and Subtext
-    \node[titlenode] at (n1.center) [yshift=-0.1cm] {Datenschutzerklärung};
-    \node[titlenode] at (n2.center) [yshift=-0.1cm] {Datenminimierung};
-    \node[titlenode] at (n3.center) [yshift=-0.1cm] {Vertraulichkeit};
-    \node[titlenode] at (n4.center) [yshift=-0.1cm] {Betroffenenrechte};
->>>>>>> 803bdb234a8828ce66f183a23b58191a2c208a40
 \end{tikzpicture}
 \end{center}
 
@@ -139,6 +120,7 @@
 
 ![](image.png)
 
+---
 
 ## Backup- & Restore-Systeme (2)
 - **Speichermanagement (Retention)**: