[3373] Addressed review comments.

The merge logic was simplified a bit and the commentary was improved.
[3373] Typo on comment.