fixed merge screwup