Fixing merge conflict

4 jobs for !102 with meeting/LI64
in 39 seconds, using 0 compute credits, and was queued for 1 second
merge request