* Fix false positive "meaningful conflict" detection for strategic merge patch with integer values. ([#44788](https://github.com/kubernetes/kubernetes/pull/44788), [@enisoc](https://github.com/enisoc))

- Update Go used to build migrate script in etcd image to v1.16.7. ([#104301](https://github.com/kubernetes/kubernetes/pull/104301), [@serathius](https://github.com/serathius))
- Updated json representation for a conflicted taint to `Key=Effect` when a conflicted taint occurs in kubectl taint. ([#104011](https://github.com/kubernetes/kubernetes/pull/104011), [@manugupt1](https://github.com/manugupt1))
- Upgrades functionality of `kubectl kustomize` as described at

### SIG Apps

- The service controller will now retry creating the load balancer when `persistUpdate` fails due to conflict. ([#68087](https://github.com/kubernetes/kubernetes/pull/68087), [@grayluck](https://github.com/grayluck))

* GCE: Fixes loadbalancer creation and deletion issues appearing in 1.10.5. ([#66400](https://github.com/kubernetes/kubernetes/pull/66400), [@nicksardo](https://github.com/nicksardo))
* fixes spurious "meaningful conflict" error encountered by nodes attempting to update status, which could cause them to be considered unready ([#66169](https://github.com/kubernetes/kubernetes/pull/66169), [@liggitt](https://github.com/liggitt))

     */
    @Required
    @Size(max = 1000)
    public String id;

    /**
     * The version number of the user for optimistic locking.
     * This field is required to prevent concurrent modification conflicts
     * by ensuring the user hasn't been modified by another process.
     */
    @Required
    @ValidateTypeFailure
    public Integer versionNo;

ventDefault(),f._jQueryInterface.call(n.default(this),"load")})),n.default((function(){n.default(r).each((function(){f._jQueryInterface.call(n.default(this))}))})),n.default.fn[i]=f._jQueryInterface,n.default.fn[i].Constructor=f,n.default.fn[i].noConflict=function(){return n.default.fn[i]=l,f._jQueryInterface};var u="CardWidget",c="lte.cardwidget",h=n.default.fn[u],g="card",p="collapsed-card",m="collapsing-card",v="expanding-card",_="was-collapsed",b="maximized-card",y='[data-card-widget="remove...

    @ValidateTypeFailure
    public Long updatedTime;

    /**
     * The version number of the duplicate host configuration for optimistic locking.
     * This field is required to prevent concurrent modification conflicts
     * by ensuring the configuration hasn't been modified by another process.
     */
    @Required
    @ValidateTypeFailure
    public Integer versionNo;

     */
    @Required
    @Size(max = 1000)
    public String id;

    /**
     * The version number of the scheduler for optimistic locking.
     * This field is required to prevent concurrent modification conflicts
     * by ensuring the scheduler hasn't been modified by another process.
     */
    @Required
    @ValidateTypeFailure
    public Integer versionNo;

     */
    @ValidateTypeFailure
    public Long updatedTime;

    /**
     * The version number of the label type for optimistic locking.
     * This field is required to prevent concurrent modification conflicts
     * by ensuring the label type hasn't been modified by another process.
     */
    @Required
    @ValidateTypeFailure
    public Integer versionNo;

     */
    @ValidateTypeFailure
    public Long updatedTime;

    /**
     * The version number of the role for optimistic locking.
     * This field is required to prevent concurrent modification conflicts
     * by ensuring the role hasn't been modified by another process.
     */
    @Required
    @ValidateTypeFailure
    public Integer versionNo;