Fix up result of merge