diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-keyring b/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-keyring
new file mode 100644
index 000000000..bbfc12562
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-keyring
@@ -0,0 +1 @@
+# Calculate append=skip merge(gnome-base/gnome-keyring)!= merge=x11-misc/lightdm
diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager b/profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager
index 8c4e28aed..852968fbd 100644
--- a/profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager
+++ b/profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager
@@ -1 +1 @@
-# Calculate append=skip merge(mate-base/mate-session-manager)!= merge=x11-apps/xinit,x11-drivers/xf86-input-synaptics
+# Calculate append=skip merge(mate-base/mate-session-manager)!= merge=x11-apps/xinit,x11-drivers/xf86-input-synaptics,x11-misc/lightdm
diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm
index 36ebd52a1..306a358e2 100644
--- a/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm
+++ b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm
@@ -9,4 +9,6 @@ account    include		system-login
 password   include		system-login
 
 session    include		system-auth
+#?pkg(gnome-base/gnome-keyring)!=&&pkg(mate-base/mate-session-manager)==#
 session    optional		pam_gnome_keyring.so auto_start
+#pkg#
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
index ad93b78c6..5b20bcf07 100644
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20191226
+remerge = 20191230
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230
new file mode 100644
index 000000000..586f46102
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=gnome-base/gnome-keyring
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#