Fix errors from merge conflict resolution

2 jobs for dev-subs_vis
in 7 minutes and 7 seconds, using 0 compute credits, and was queued for 13 minutes and 37 seconds