Fix merging screwups