fixed the problem caused the prev. manual merge