Minor edit, resolved conflicts