fix a merging error