fixed merging error