diff --git a/backside.tex b/backside.tex
index 88ee07a..eb900ac 100644
--- a/backside.tex
+++ b/backside.tex
@@ -15,8 +15,13 @@ Dieses Dokument wurde nur unter der Verwendung von Open Source Software erstellt
 Inkscape & \url{https://www.inkscape.org/} \\
 The Gimp & \url{https://www.gimp.org/} \\
 QCAD & \url{https://qcad.org/} \\
+<<<<<<< HEAD
 Visual Studio Code & \url{https://code.visualstudio.com/} \\
+=======
+%Atom Editor & \url{https://atom.io/} \\
+>>>>>>> 1c03663c940285488f275c4b767c7fe8a9add064
 LibreOffice & \url{https://www.libreoffice.org/} \\
 pdftk & \url{https://www.pdflabs.com/} \\
-Linux & \url{https://www.linux.org/}
+Linux & \url{https://www.linux.org/} \\
+Git & \url{https://git-scm.com/}
 \end{tabularx}