solve conflicts

5 jobs for dev-add_ukmo_check
in 20 minutes and 29 seconds, using 0 compute credits, and was queued for 1 second