correct partially errors due to merge problem