fix merge conflict

in 6 minutes and 34 seconds, using 0 compute credits, and was queued for 2 seconds
merge request