Having one method 'mergeContent()' and another one 'contentMerge()' in this class is not nice. It's hard to find out which method is doing what. Therefore I refactored ResolveMerger so that there is only one method where we do content merge (see change #4366). I would suggest you rebase this change on top of 4366 and adapt it to the new structure. That will look much cleaner.