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)