removed conflicting (dropbox) file