Minor unresolved conflicts from previous merge.