Fix up previous merge conflicts