This should cause some problems

Norv is 70% sure we should do this
I'm 90% sure I made a mistake on the initial set of commits and I'm 85% sure I made mistakes during the merge conflict stage and 66% sure that I made the correct updates to to the commits required post conflict for the latest changes.

Net ....  there is a 5% chance this will work without requiring more changes