fix merge leftovers