merger?

can we just merge your forked copy with my original to be consistent?