fix bad merging-02