Clean up merging errors.