osx updates
fixed merges