WIP: improved MergeHandler and comments