More bad merge screwups fixed