Same issue here
I get a new computer listing each time I restart the client. And merging is one-way: it always merges the old computer into the new one. All history is preserved, so you don't lose anything. (This is with the Linux client, btw, not that Mac.)
===
Purveyor of Doc Hope's [link|http://DocHope.com|fresh-baked dog biscuits and pet treats].
[link|http://DocHope.com|http://DocHope.com]