osx local changes
local merge
accepted github changes