Issue #46 - Improve merging.  Cleanup of previous commit.