Make new patch
Resolve conflict after adding new patch for ding_availability.js