ac: shortcuts update
org: case fix + merge strategy changed

to avoid failure when there is no symlink dropbox → Dropbox