Resolving merge conflicts

2 jobs for temp/cr045
in 12 seconds, using 0 compute credits, and was queued for 14 seconds