fix merging bug.