merge error correction