Correct a error merge