diff --git a/Themen.org b/Themen.org
index 81015a9..e12cb61 100644
--- a/Themen.org
+++ b/Themen.org
@@ -115,4 +115,15 @@
 
 
 ** Jabber/XMPP
+<<<<<<< HEAD
 ** JMStV
+=======
+
+** HTTP
+   Was ist das Hypertext Transfer Protocol?
+
+** HTTP/2
+
+** git
+Wie funktioniert git?
+>>>>>>> 968fc777fc750eaa4e4d6ca7a1fcc858cd2893e1