BUG:fix bugs casued by merge