merged basicerrors corrected