I love that my G2 automatically syncs contacts from both Facebook and Gmail, and does a great job merging the contact information from both sources under single entries in my contact list.

I have some friends that use screen names instead of their real names on Facebook, so I end up with two entries for them, because the G2 doesn't know they're really identical. Is there a way to merge contact list entries that is under user control?