mac config
fix conflicts