Resolve conflict

3 jobs for !19 with maintenance/changemarks
in 18 seconds, using 0 compute credits, and was queued for 9 seconds
merge request