First cut at merging tags on merge messages