fixed weird merge metadata causing VM failures
Merge pull request #1476 from ggailey777/zumo_master

fixed weird merge metadata causing VM failures