try to fix merge errors