Resolve conflict with DS-792