fix error from merge.