Issue #46 - Improve merging.  Part 1 of changes (all simple attributes).