errors corrections
error correction
conflict resolved