Fix conflicts

3 jobs for dev-add_gpfs
in 2 minutes and 8 seconds, using 0 compute credits, and was queued for 2 seconds