fix a merge accidence