prd-3965 added a merge strategy for fields and tags.
Merge pull request #21 from gretchiemoran/master

prd-3965 added a merge strategy for fields and tags.