fix merge breakage