Fix up improper merge