fix conflited issue