Nuxeo vs Alfresco software architecture

If you are interested in the Content Services space and have not lived under a rock for the past 2 years you probably know by now that both Alfresco and Nuxeo are now part of the same company, Hyland.

A happy end to an open source rivalry? I guess time will tell :)