OK, made it configurable. However, this complicated the implementation of this method a bit as I had to distinguish the case where the configured MergeStrategy is an instanceof ThreeWayMergeStrategy and where it is not. I don't know if it was possible to do the implementation by using only the base MergeStrategy interface.