Conflict errors deleted