add linux
fix mac conflic