converted to Mac app
fixed merge conflict