diff --git a/Conf/home.meszely.eu/matrix.home.meszely.eu.md b/Conf/home.meszely.eu/matrix.home.meszely.eu.md
index b2fb649..30ff92e 100644
--- a/Conf/home.meszely.eu/matrix.home.meszely.eu.md
+++ b/Conf/home.meszely.eu/matrix.home.meszely.eu.md
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 # Matrix - n8n-bot - Accesstoken
 syt_Ym90LW44bg_RMzxOFQllPjSPsRWAHvb_0FeoGL
+=======
+# bot-n8n access token
+syt_Ym90LW44bg_AbviDZpPwRhLydqppDvv_2OfdD8
+>>>>>>> 2e10f37 (token)
diff --git a/Doc/Default-01.md b/Doc/Default-01.md
index d09765b..1ed2a9c 100644
--- a/Doc/Default-01.md
+++ b/Doc/Default-01.md
@@ -8,7 +8,7 @@ ep..Ep
 
 Server:
 t1.meszely
-vi..Vi
+warP#....#Maci
 
 000
 pandA#...#min