fix diff-to-dropbox for multiple branches, add staches