fixing merge screwups