Fix error of merge