Correct small errors before merging