fixing some merge screwups