fix macos
fix conflict