error correction at merge