Michelle and Dave testing Hitch
Dealing with a minor merge issue