fix merge errors

derp