Fix bad trace fix merge