fix tag merging