Tweaked again to check git merging after first change was resolved.
Merge /www/htdocs/t3/wheatplus