merge errors deleted