In attempt to help resolve merge conflicts I am adding the pom to merge strategy theirs...
In attempt to help resolve merge conflicts I am adding the pom to merge strategy theirs...

virtuoushub/fuzzy-octo-shame,FOShameDotOrg/fuzzy-octo-shame,FOShameDotOrg/fuzzy-octo-shame,virtuoushub/fuzzy-octo-shame,Hornswaggler/fuzzy-octo-shame