fixed a merging error