Fix the error merge code.