merge errors fix