fix problem resulted by rebase merging