Pre-change refactoring, to be able to easily change the merge strategy.