resolve merge conflicts

2 jobs for dev-multimodel2
in 8 minutes and 39 seconds, using 0 compute credits, and was queued for 10 minutes and 30 seconds