[oS-support] update conflict with