Yes, they are meant to be merged, but from what I've heard, people still have problems. It all seems to work fine for me and I'm always connected, but I've never really tried to find problems with it. I am *really* hoping that this log option will be optional in the next version because I think it causes many more problems for many more people than the few problems that a minority of people experienced with the old system. In the meantime, if you can't get it to work properly, just change back to 6.20 for now.
