Boy Boy, you are in bad luck
I most probabaly made the mistake by choosing delete instead of merging all the gconf conflicts.
First of all due a bug in the entropy version you used, those config files were not used during installation, but kept and presented to you as updateable config files. Due this bug i told people to FIRST equo update && equo install entropy and then do the gnome updating.
Now with the bug intact, reinstalling with the MERGED config files would have fixed it.
What i'd try todo now is equo remove gnome-session && equo install gnome-session