Fix tag merging issue.

Added a 2nd safe-guard against a situation where the local tag is
created, but it already exists on the server. Now the local tag will be
assigned the RemoteId of the remote tag.