Class DefaultThreeWayConflictHandler