Fix merging of tags during sync conflict

If an item was added to a tag on one computer and another item was added
to the tag on a different computer, and then they both synced one of the
tags could be removed on the second computer to sync.