first attempt at fix
don't write to Dropbox if not needed
fix conflicts