Resolved conflicts found during merge

1 job for bug#238
in 0 seconds, using 0 compute credits, and was queued for 26 seconds