Solving merge conflicts.

1 job for RainFARM
in 47 seconds, using 0 compute credits, and was queued for 2 seconds