Fixing bugs with file conflicts
Merge branch 'mac_overlays' of https://github.com/stacksync/desktop.git into mac_overlays