got the conflicts unconflicted. ;)

Was not bad at all Pierce; ; just grab a fresh copy of the Master branch
now and should be good to go.  Thanks!