Sync iCloud with On My Mac - or merge the two

I have noticed that since upgrading to Lion, ios 5, and switching over from Mobile Me to iCloud, I now have duplicates in my Address Book contacts. I am assuming it is due to the switch to iCloud. Previously, I had my Address Book set to sync with Yahoo and Google as well as Mobile Me. This seemed to keep all 3 accounts in sync. Now, I have 2 accounts: On My Mac and iCloud. In Preferences, I have On My Mac set to sync with Google and Yahoo. Is there any way to keep On My Mac and iCloud in sync? Is my perception that the change occured when I switched to iCloud accurate? Am I accurate in observing that all my contacts were, in fact, 3-way syncing prior to iCloud and that now they are not? Is there any way to get them all syncing again? And can anyone provide insight as to why this very un-helpful change would have been implemented by Apple? Thank you!

Is there anyway to just merge iCloud with On My Mac? On a side note, I'm having similar issues with To Do's aka Reminders in iCal.