fix merge errors