OSX old changes
Fixed merge conflict