[*] refactoring for DiffMerge