fix merge nit