fix merge gone bad.