diff --git a/README.md b/README.md
index 3a00a2d..b68611b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 # Epi2O365
 
-Epirent zu Office 365 Kontakt-Synch
\ No newline at end of file
+Epirent zu Office 365 Kontakt-Synch
+=======
+# Epi2Exchange2
+
+>>>>>>> 25eb04a98c1e26e079c696e683ab5a927f63ebfc