Mac OS X settings
Fixing conflict