changed repo
Fixed #344 Mac branch: no conflict popup
Merge branch 'OSX_notification'