Fix merges involving clean subtrees with StrategySimpleTwoWayInCore