resolve merge conflicts

2 jobs for dev-saving-seasonal
in 38 seconds, using 0 compute credits, and was queued for 1 second